mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
chore: bump chromium to 9b2191ea59cba1e2f6da4dbb7dee0 (master) (#25995)
This commit is contained in:
@@ -343,6 +343,7 @@ InspectableWebContents::InspectableWebContents(
|
||||
pref_service_(pref_service),
|
||||
web_contents_(web_contents),
|
||||
is_guest_(is_guest),
|
||||
is_docked_(true),
|
||||
view_(CreateInspectableContentsView(this)),
|
||||
weak_factory_(this) {
|
||||
const base::Value* bounds_dict = pref_service_->Get(kDevToolsBoundsPref);
|
||||
@@ -626,7 +627,7 @@ void InspectableWebContents::AddDevToolsExtensionsToClient() {
|
||||
#endif
|
||||
|
||||
void InspectableWebContents::SetInspectedPageBounds(const gfx::Rect& rect) {
|
||||
DevToolsContentsResizingStrategy strategy(rect);
|
||||
DevToolsContentsResizingStrategy strategy(rect, is_docked_);
|
||||
if (contents_resizing_strategy_.Equals(strategy))
|
||||
return;
|
||||
|
||||
@@ -703,6 +704,7 @@ void InspectableWebContents::LoadNetworkResource(
|
||||
|
||||
void InspectableWebContents::SetIsDocked(const DispatchCallback& callback,
|
||||
bool docked) {
|
||||
is_docked_ = docked;
|
||||
if (managed_devtools_web_contents_)
|
||||
view_->SetIsDocked(docked, activate_);
|
||||
if (!callback.is_null())
|
||||
|
||||
@@ -224,6 +224,7 @@ class InspectableWebContents
|
||||
content::WebContents* external_devtools_web_contents_ = nullptr;
|
||||
|
||||
bool is_guest_;
|
||||
bool is_docked_;
|
||||
std::unique_ptr<InspectableWebContentsView> view_;
|
||||
|
||||
class NetworkResourceLoader;
|
||||
|
||||
@@ -24,7 +24,7 @@ SubmenuButton::SubmenuButton(views::ButtonListener* button_listener,
|
||||
const base::string16& title,
|
||||
const SkColor& background_color)
|
||||
: views::MenuButton(
|
||||
button_listener,
|
||||
views::Button::PressedCallback(button_listener, this),
|
||||
gfx::RemoveAcceleratorChar(title, '&', nullptr, nullptr)),
|
||||
background_color_(background_color) {
|
||||
#if defined(OS_LINUX)
|
||||
|
||||
Reference in New Issue
Block a user