| 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 <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
| 10 #include "base/location.h" | 10 #include "base/location.h" |
| 11 #include "base/profiler/scoped_tracker.h" | 11 #include "base/profiler/scoped_tracker.h" |
| 12 #include "base/single_thread_task_runner.h" | 12 #include "base/single_thread_task_runner.h" |
| 13 #include "base/thread_task_runner_handle.h" | 13 #include "base/threading/thread_task_runner_handle.h" |
| 14 #include "base/time/time.h" | 14 #include "base/time/time.h" |
| 15 #include "chrome/browser/extensions/extension_message_bubble_controller.h" | 15 #include "chrome/browser/extensions/extension_message_bubble_controller.h" |
| 16 #include "chrome/browser/extensions/extension_util.h" | 16 #include "chrome/browser/extensions/extension_util.h" |
| 17 #include "chrome/browser/profiles/profile.h" | 17 #include "chrome/browser/profiles/profile.h" |
| 18 #include "chrome/browser/sessions/session_tab_helper.h" | 18 #include "chrome/browser/sessions/session_tab_helper.h" |
| 19 #include "chrome/browser/ui/browser.h" | 19 #include "chrome/browser/ui/browser.h" |
| 20 #include "chrome/browser/ui/browser_window.h" | 20 #include "chrome/browser/ui/browser_window.h" |
| 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/extension_message_bubble_factory.h" | 23 #include "chrome/browser/ui/extensions/extension_message_bubble_factory.h" |
| (...skipping 803 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 827 for (ToolbarActionViewController* action : toolbar_actions_) { | 827 for (ToolbarActionViewController* action : toolbar_actions_) { |
| 828 if (action->GetId() == action_id) | 828 if (action->GetId() == action_id) |
| 829 return action; | 829 return action; |
| 830 } | 830 } |
| 831 return nullptr; | 831 return nullptr; |
| 832 } | 832 } |
| 833 | 833 |
| 834 content::WebContents* ToolbarActionsBar::GetCurrentWebContents() { | 834 content::WebContents* ToolbarActionsBar::GetCurrentWebContents() { |
| 835 return browser_->tab_strip_model()->GetActiveWebContents(); | 835 return browser_->tab_strip_model()->GetActiveWebContents(); |
| 836 } | 836 } |
| OLD | NEW |