| 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/toolbar_view.h" | 5 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
| 11 #include "base/i18n/number_formatting.h" | 11 #include "base/i18n/number_formatting.h" |
| 12 #include "base/prefs/pref_service.h" | 12 #include "base/prefs/pref_service.h" |
| 13 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
| 14 #include "chrome/app/chrome_command_ids.h" | 14 #include "chrome/app/chrome_command_ids.h" |
| 15 #include "chrome/browser/chrome_notification_types.h" | 15 #include "chrome/browser/chrome_notification_types.h" |
| 16 #include "chrome/browser/command_updater.h" | 16 #include "chrome/browser/command_updater.h" |
| 17 #include "chrome/browser/extensions/extension_action.h" | |
| 18 #include "chrome/browser/extensions/extension_action_manager.h" | |
| 19 #include "chrome/browser/profiles/profile.h" | 17 #include "chrome/browser/profiles/profile.h" |
| 20 #include "chrome/browser/themes/theme_service.h" | 18 #include "chrome/browser/themes/theme_service.h" |
| 21 #include "chrome/browser/ui/browser.h" | 19 #include "chrome/browser/ui/browser.h" |
| 22 #include "chrome/browser/ui/browser_command_controller.h" | 20 #include "chrome/browser/ui/browser_command_controller.h" |
| 23 #include "chrome/browser/ui/browser_commands.h" | 21 #include "chrome/browser/ui/browser_commands.h" |
| 24 #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h" | 22 #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h" |
| 25 #include "chrome/browser/ui/browser_instant_controller.h" | 23 #include "chrome/browser/ui/browser_instant_controller.h" |
| 26 #include "chrome/browser/ui/browser_tabstrip.h" | 24 #include "chrome/browser/ui/browser_tabstrip.h" |
| 27 #include "chrome/browser/ui/browser_window.h" | 25 #include "chrome/browser/ui/browser_window.h" |
| 28 #include "chrome/browser/ui/global_error/global_error_service.h" | 26 #include "chrome/browser/ui/global_error/global_error_service.h" |
| (...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 316 return (translate_icon_view && translate_icon_view->visible()) ? | 314 return (translate_icon_view && translate_icon_view->visible()) ? |
| 317 translate_icon_view : app_menu_; | 315 translate_icon_view : app_menu_; |
| 318 } | 316 } |
| 319 | 317 |
| 320 void ToolbarView::ExecuteExtensionCommand( | 318 void ToolbarView::ExecuteExtensionCommand( |
| 321 const extensions::Extension* extension, | 319 const extensions::Extension* extension, |
| 322 const extensions::Command& command) { | 320 const extensions::Command& command) { |
| 323 browser_actions_->ExecuteExtensionCommand(extension, command); | 321 browser_actions_->ExecuteExtensionCommand(extension, command); |
| 324 } | 322 } |
| 325 | 323 |
| 326 void ToolbarView::ShowPageActionPopup(const extensions::Extension* extension) { | |
| 327 extensions::ExtensionActionManager* extension_manager = | |
| 328 extensions::ExtensionActionManager::Get(browser_->profile()); | |
| 329 ExtensionAction* extension_action = | |
| 330 extension_manager->GetPageAction(*extension); | |
| 331 if (extension_action) { | |
| 332 location_bar_->GetPageActionView(extension_action)->image_view()-> | |
| 333 view_controller()->ExecuteAction(ExtensionPopup::SHOW, false); | |
| 334 } | |
| 335 } | |
| 336 | |
| 337 void ToolbarView::ShowBrowserActionPopup( | |
| 338 const extensions::Extension* extension) { | |
| 339 browser_actions_->ShowPopupForExtension(extension, true, false); | |
| 340 } | |
| 341 | |
| 342 void ToolbarView::ShowAppMenu(bool for_drop) { | 324 void ToolbarView::ShowAppMenu(bool for_drop) { |
| 343 if (wrench_menu_.get() && wrench_menu_->IsShowing()) | 325 if (wrench_menu_.get() && wrench_menu_->IsShowing()) |
| 344 return; | 326 return; |
| 345 | 327 |
| 346 if (keyboard::KeyboardController::GetInstance() && | 328 if (keyboard::KeyboardController::GetInstance() && |
| 347 keyboard::KeyboardController::GetInstance()->keyboard_visible()) { | 329 keyboard::KeyboardController::GetInstance()->keyboard_visible()) { |
| 348 keyboard::KeyboardController::GetInstance()->HideKeyboard( | 330 keyboard::KeyboardController::GetInstance()->HideKeyboard( |
| 349 keyboard::KeyboardController::HIDE_REASON_AUTOMATIC); | 331 keyboard::KeyboardController::HIDE_REASON_AUTOMATIC); |
| 350 } | 332 } |
| 351 | 333 |
| (...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 787 | 769 |
| 788 void ToolbarView::OnShowHomeButtonChanged() { | 770 void ToolbarView::OnShowHomeButtonChanged() { |
| 789 Layout(); | 771 Layout(); |
| 790 SchedulePaint(); | 772 SchedulePaint(); |
| 791 } | 773 } |
| 792 | 774 |
| 793 int ToolbarView::content_shadow_height() const { | 775 int ToolbarView::content_shadow_height() const { |
| 794 return browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH ? | 776 return browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH ? |
| 795 kContentShadowHeightAsh : kContentShadowHeight; | 777 kContentShadowHeightAsh : kContentShadowHeight; |
| 796 } | 778 } |
| OLD | NEW |