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

Side by Side Diff: chrome/browser/ui/views/toolbar/browser_actions_container.h

Issue 553243002: Track the active ExtensionKeybindingRegistry and make it available to EventRewriter. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkcr
Patch Set: Created 6 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_
6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_ 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_
7 7
8 #include "base/observer_list.h" 8 #include "base/observer_list.h"
9 #include "chrome/browser/extensions/extension_keybinding_registry.h" 9 #include "chrome/browser/extensions/extension_keybinding_registry.h"
10 #include "chrome/browser/extensions/extension_toolbar_model.h" 10 #include "chrome/browser/extensions/extension_toolbar_model.h"
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 virtual extensions::ActiveTabPermissionGranter* 241 virtual extensions::ActiveTabPermissionGranter*
242 GetActiveTabPermissionGranter() OVERRIDE; 242 GetActiveTabPermissionGranter() OVERRIDE;
243 243
244 // Retrieve the current popup. This should only be used by unit tests. 244 // Retrieve the current popup. This should only be used by unit tests.
245 ExtensionPopup* TestGetPopup(); 245 ExtensionPopup* TestGetPopup();
246 246
247 // Set how many icons the container should show. This should only be used by 247 // Set how many icons the container should show. This should only be used by
248 // unit tests. 248 // unit tests.
249 void TestSetIconVisibilityCount(size_t icons); 249 void TestSetIconVisibilityCount(size_t icons);
250 250
251 // The class that registers for keyboard shortcuts for extension commands.
252 extensions::ExtensionKeybindingRegistry* GetExtensionKeybindingRegistry();
Devlin 2014/09/11 19:48:48 This should go with the other simple accessors. N
253
251 // During testing we can disable animations by setting this flag to true, 254 // During testing we can disable animations by setting this flag to true,
252 // so that the bar resizes instantly, instead of having to poll it while it 255 // so that the bar resizes instantly, instead of having to poll it while it
253 // animates to open/closed status. 256 // animates to open/closed status.
254 static bool disable_animations_during_testing_; 257 static bool disable_animations_during_testing_;
255 258
256 protected: 259 protected:
257 // Overridden from views::View: 260 // Overridden from views::View:
258 virtual void ViewHierarchyChanged( 261 virtual void ViewHierarchyChanged(
259 const ViewHierarchyChangedDetails& details) OVERRIDE; 262 const ViewHierarchyChangedDetails& details) OVERRIDE;
260 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 263 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 420
418 // Handles delayed showing of the overflow menu when hovering. 421 // Handles delayed showing of the overflow menu when hovering.
419 base::WeakPtrFactory<BrowserActionsContainer> show_menu_task_factory_; 422 base::WeakPtrFactory<BrowserActionsContainer> show_menu_task_factory_;
420 423
421 ObserverList<BrowserActionsContainerObserver> observers_; 424 ObserverList<BrowserActionsContainerObserver> observers_;
422 425
423 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer); 426 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);
424 }; 427 };
425 428
426 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_ 429 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698