OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/toolbar/toolbar_actions_bar.h" | 5 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 10 matching lines...) Expand all Loading... |
21 #include "chrome/browser/ui/extensions/extension_action_view_controller.h" | 21 #include "chrome/browser/ui/extensions/extension_action_view_controller.h" |
22 #include "chrome/browser/ui/extensions/extension_message_bubble_bridge.h" | 22 #include "chrome/browser/ui/extensions/extension_message_bubble_bridge.h" |
23 #include "chrome/browser/ui/extensions/settings_api_bubble_helpers.h" | 23 #include "chrome/browser/ui/extensions/settings_api_bubble_helpers.h" |
24 #include "chrome/browser/ui/layout_constants.h" | 24 #include "chrome/browser/ui/layout_constants.h" |
25 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 25 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
26 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h" | 26 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h" |
27 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h" | 27 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h" |
28 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_delegate.h" | 28 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_delegate.h" |
29 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_observer.h" | 29 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_observer.h" |
30 #include "chrome/common/pref_names.h" | 30 #include "chrome/common/pref_names.h" |
31 #include "chrome/grit/theme_resources.h" | |
32 #include "components/crx_file/id_util.h" | 31 #include "components/crx_file/id_util.h" |
33 #include "components/pref_registry/pref_registry_syncable.h" | 32 #include "components/pref_registry/pref_registry_syncable.h" |
34 #include "extensions/browser/extension_system.h" | 33 #include "extensions/browser/extension_system.h" |
35 #include "extensions/browser/extension_util.h" | 34 #include "extensions/browser/extension_util.h" |
36 #include "extensions/browser/runtime_data.h" | 35 #include "extensions/browser/runtime_data.h" |
37 #include "extensions/common/extension.h" | 36 #include "extensions/common/extension.h" |
38 #include "extensions/common/feature_switch.h" | 37 #include "extensions/common/feature_switch.h" |
39 #include "ui/base/resource/resource_bundle.h" | 38 #include "ui/base/resource/resource_bundle.h" |
40 #include "ui/gfx/image/image_skia.h" | 39 #include "ui/gfx/image/image_skia.h" |
41 | 40 |
(...skipping 775 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
817 for (const auto& action : toolbar_actions_) { | 816 for (const auto& action : toolbar_actions_) { |
818 if (action->GetId() == action_id) | 817 if (action->GetId() == action_id) |
819 return action.get(); | 818 return action.get(); |
820 } | 819 } |
821 return nullptr; | 820 return nullptr; |
822 } | 821 } |
823 | 822 |
824 content::WebContents* ToolbarActionsBar::GetCurrentWebContents() { | 823 content::WebContents* ToolbarActionsBar::GetCurrentWebContents() { |
825 return browser_->tab_strip_model()->GetActiveWebContents(); | 824 return browser_->tab_strip_model()->GetActiveWebContents(); |
826 } | 825 } |
OLD | NEW |