Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(230)

Unified Diff: chrome/browser/ui/views/toolbar/browser_actions_container.cc

Issue 838253004: MacViews: Fix duplicate definition of ExtensionKeyBindingRegistry::SetShortcutHandlingSuspended (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@DragBookmarks2
Patch Set: Observe widget to cleanup event monitor Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/toolbar/browser_actions_container.cc
diff --git a/chrome/browser/ui/views/toolbar/browser_actions_container.cc b/chrome/browser/ui/views/toolbar/browser_actions_container.cc
index c56b9dd6614c3e16ddef65d02f16b424265ef629..457813bfb4d2e645b10dabbf931c3a258162846b 100644
--- a/chrome/browser/ui/views/toolbar/browser_actions_container.cc
+++ b/chrome/browser/ui/views/toolbar/browser_actions_container.cc
@@ -735,10 +735,10 @@ void BrowserActionsContainer::ViewHierarchyChanged(
if (details.is_add && details.child == this) {
if (!in_overflow_mode() && // We only need one keybinding registry.
- parent()->GetFocusManager()) { // focus manager can be null in tests.
+ GetFocusManager()) { // focus manager can be null in tests.
extension_keybinding_registry_.reset(new ExtensionKeybindingRegistryViews(
browser_->profile(),
- parent()->GetFocusManager(),
+ GetWidget(),
extensions::ExtensionKeybindingRegistry::ALL_EXTENSIONS,
this));
}

Powered by Google App Engine
This is Rietveld 408576698