| 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_keybinding_registry_tracker.h" |
| 17 #include "chrome/browser/extensions/extension_util.h" | 18 #include "chrome/browser/extensions/extension_util.h" |
| 18 #include "chrome/browser/profiles/profile.h" | 19 #include "chrome/browser/profiles/profile.h" |
| 19 #include "chrome/browser/themes/theme_service.h" | 20 #include "chrome/browser/themes/theme_service.h" |
| 20 #include "chrome/browser/ui/browser.h" | 21 #include "chrome/browser/ui/browser.h" |
| 21 #include "chrome/browser/ui/browser_command_controller.h" | 22 #include "chrome/browser/ui/browser_command_controller.h" |
| 22 #include "chrome/browser/ui/browser_commands.h" | 23 #include "chrome/browser/ui/browser_commands.h" |
| 23 #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h" | 24 #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h" |
| 24 #include "chrome/browser/ui/browser_instant_controller.h" | 25 #include "chrome/browser/ui/browser_instant_controller.h" |
| 25 #include "chrome/browser/ui/browser_tabstrip.h" | 26 #include "chrome/browser/ui/browser_tabstrip.h" |
| 26 #include "chrome/browser/ui/browser_window.h" | 27 #include "chrome/browser/ui/browser_window.h" |
| (...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 264 back_->SetTooltipText( | 265 back_->SetTooltipText( |
| 265 l10n_util::GetStringUTF16(IDS_ACCNAME_TOOLTIP_BACK)); | 266 l10n_util::GetStringUTF16(IDS_ACCNAME_TOOLTIP_BACK)); |
| 266 forward_->SetTooltipText( | 267 forward_->SetTooltipText( |
| 267 l10n_util::GetStringUTF16(IDS_ACCNAME_TOOLTIP_FORWARD)); | 268 l10n_util::GetStringUTF16(IDS_ACCNAME_TOOLTIP_FORWARD)); |
| 268 } | 269 } |
| 269 } | 270 } |
| 270 | 271 |
| 271 void ToolbarView::OnWidgetVisibilityChanged(views::Widget* widget, | 272 void ToolbarView::OnWidgetVisibilityChanged(views::Widget* widget, |
| 272 bool visible) { | 273 bool visible) { |
| 273 // Safe to call multiple times; the bubble will only appear once. | 274 // Safe to call multiple times; the bubble will only appear once. |
| 274 if (visible) | 275 if (visible) { |
| 275 extension_message_bubble_factory_->MaybeShow(app_menu_); | 276 extension_message_bubble_factory_->MaybeShow(app_menu_); |
| 277 extensions::ExtensionKeybindingRegistryTracker::Get(browser_->profile()) |
| 278 ->SetActiveRegistry(browser_actions_->GetExtensionKeybindingRegistry()); |
| 279 } |
| 276 } | 280 } |
| 277 | 281 |
| 278 void ToolbarView::Update(WebContents* tab) { | 282 void ToolbarView::Update(WebContents* tab) { |
| 279 if (location_bar_) | 283 if (location_bar_) |
| 280 location_bar_->Update(tab); | 284 location_bar_->Update(tab); |
| 281 if (browser_actions_) | 285 if (browser_actions_) |
| 282 browser_actions_->RefreshBrowserActionViews(); | 286 browser_actions_->RefreshBrowserActionViews(); |
| 283 if (reload_) | 287 if (reload_) |
| 284 reload_->set_menu_enabled(chrome::IsDebuggerAttachedToCurrentTab(browser_)); | 288 reload_->set_menu_enabled(chrome::IsDebuggerAttachedToCurrentTab(browser_)); |
| 285 } | 289 } |
| (...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 766 | 770 |
| 767 void ToolbarView::OnShowHomeButtonChanged() { | 771 void ToolbarView::OnShowHomeButtonChanged() { |
| 768 Layout(); | 772 Layout(); |
| 769 SchedulePaint(); | 773 SchedulePaint(); |
| 770 } | 774 } |
| 771 | 775 |
| 772 int ToolbarView::content_shadow_height() const { | 776 int ToolbarView::content_shadow_height() const { |
| 773 return browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH ? | 777 return browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH ? |
| 774 kContentShadowHeightAsh : kContentShadowHeight; | 778 kContentShadowHeightAsh : kContentShadowHeight; |
| 775 } | 779 } |
| OLD | NEW |