chrome/browser/ui/views/toolbar/browser_actions_container.cc - Issue 576413002: Reland Track the active ExtensionKeybindingRegistry and make it available to EventRewriter.

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

Issue 576413002: Reland 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

« no previous file with comments | « chrome/browser/ui/views/toolbar/browser_actions_container.h ('k') | chrome/browser/ui/views/toolbar/toolbar_view.h » ('j') | no next file with comments »

OLD	NEW
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 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"	5 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"

6	6

7 #include "base/compiler_specific.h"	7 #include "base/compiler_specific.h"

8 #include "base/stl_util.h"	8 #include "base/stl_util.h"

9 #include "chrome/browser/extensions/extension_action_manager.h"	9 #include "chrome/browser/extensions/extension_action_manager.h"

10 #include "chrome/browser/extensions/extension_util.h"	10 #include "chrome/browser/extensions/extension_util.h"

11 #include "chrome/browser/extensions/extension_view_host.h"	11 #include "chrome/browser/extensions/extension_view_host.h"

12 #include "chrome/browser/extensions/tab_helper.h"	12 #include "chrome/browser/extensions/tab_helper.h"

13 #include "chrome/browser/profiles/profile.h"	13 #include "chrome/browser/profiles/profile.h"

14 #include "chrome/browser/ui/browser.h"	14 #include "chrome/browser/ui/browser.h"

15 #include "chrome/browser/ui/browser_window.h"	15 #include "chrome/browser/ui/browser_window.h"

16 #include "chrome/browser/ui/tabs/tab_strip_model.h"	16 #include "chrome/browser/ui/tabs/tab_strip_model.h"

17 #include "chrome/browser/ui/view_ids.h"	17 #include "chrome/browser/ui/view_ids.h"

18 #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h"	18 #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h"

19 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views .h"

20 #include "chrome/browser/ui/views/extensions/extension_popup.h"	19 #include "chrome/browser/ui/views/extensions/extension_popup.h"

21 #include "chrome/browser/ui/views/frame/browser_view.h"	20 #include "chrome/browser/ui/views/frame/browser_view.h"

22 #include "chrome/browser/ui/views/toolbar/browser_actions_container_observer.h"	21 #include "chrome/browser/ui/views/toolbar/browser_actions_container_observer.h"

23 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"	22 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"

24 #include "chrome/common/extensions/command.h"	23 #include "chrome/common/extensions/command.h"

25 #include "chrome/grit/generated_resources.h"	24 #include "chrome/grit/generated_resources.h"

26 #include "extensions/browser/extension_registry.h"	25 #include "extensions/browser/extension_registry.h"

27 #include "extensions/browser/extension_system.h"	26 #include "extensions/browser/extension_system.h"

28 #include "extensions/browser/runtime_data.h"	27 #include "extensions/browser/runtime_data.h"

29 #include "extensions/common/feature_switch.h"	28 #include "extensions/common/feature_switch.h"

(...skipping 1106 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1136 if (initialized_ && profile_->IsOffTheRecord()) {	1135 if (initialized_ && profile_->IsOffTheRecord()) {

1137 main_displayed = in_overflow_mode() ?	1136 main_displayed = in_overflow_mode() ?

1138 main_container_->VisibleBrowserActionsAfterAnimation() :	1137 main_container_->VisibleBrowserActionsAfterAnimation() :

1139 VisibleBrowserActionsAfterAnimation();	1138 VisibleBrowserActionsAfterAnimation();

1140 }	1139 }

1141	1140

1142 // The overflow displays any (displayable) icons not shown by the main bar.	1141 // The overflow displays any (displayable) icons not shown by the main bar.

1143 return in_overflow_mode() ?	1142 return in_overflow_mode() ?

1144 displayable_icon_count - main_displayed : main_displayed;	1143 displayable_icon_count - main_displayed : main_displayed;

1145 }	1144 }

OLD	NEW