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_commands_global_registry.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 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
263 IsAccessibleBrowser()) { | 264 IsAccessibleBrowser()) { |
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 if (visible) { |
274 if (visible) | 275 // Safe to call multiple times; the bubble will only appear once. |
275 extension_message_bubble_factory_->MaybeShow(app_menu_); | 276 extension_message_bubble_factory_->MaybeShow(app_menu_); |
277 } | |
278 | |
279 extensions::ExtensionCommandsGlobalRegistry* registry = | |
280 extensions::ExtensionCommandsGlobalRegistry::Get(browser_->profile()); | |
281 if (registry) { | |
282 if (visible) { | |
sky
2014/09/16 02:34:48
Isn't it the active state and not the visibility y
David Tseng
2014/09/16 04:11:53
You're right. Added WidgetObserver override.
| |
283 registry->set_registry_for_active_window( | |
284 browser_actions_->extension_keybinding_registry()); | |
285 } else if (registry->registry_for_active_window() == | |
286 browser_actions_->extension_keybinding_registry()) { | |
287 registry->set_registry_for_active_window(NULL); | |
288 } | |
289 } | |
290 } | |
291 | |
292 void ToolbarView::OnWidgetDestroyed(views::Widget* widget) { | |
293 extensions::ExtensionCommandsGlobalRegistry* registry = | |
294 extensions::ExtensionCommandsGlobalRegistry::Get(browser_->profile()); | |
295 if (registry && | |
296 registry->registry_for_active_window() == | |
297 browser_actions_->extension_keybinding_registry()) | |
298 registry->set_registry_for_active_window(NULL); | |
276 } | 299 } |
277 | 300 |
278 void ToolbarView::Update(WebContents* tab) { | 301 void ToolbarView::Update(WebContents* tab) { |
279 if (location_bar_) | 302 if (location_bar_) |
280 location_bar_->Update(tab); | 303 location_bar_->Update(tab); |
281 if (browser_actions_) | 304 if (browser_actions_) |
282 browser_actions_->RefreshBrowserActionViews(); | 305 browser_actions_->RefreshBrowserActionViews(); |
283 if (reload_) | 306 if (reload_) |
284 reload_->set_menu_enabled(chrome::IsDebuggerAttachedToCurrentTab(browser_)); | 307 reload_->set_menu_enabled(chrome::IsDebuggerAttachedToCurrentTab(browser_)); |
285 } | 308 } |
(...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
766 | 789 |
767 void ToolbarView::OnShowHomeButtonChanged() { | 790 void ToolbarView::OnShowHomeButtonChanged() { |
768 Layout(); | 791 Layout(); |
769 SchedulePaint(); | 792 SchedulePaint(); |
770 } | 793 } |
771 | 794 |
772 int ToolbarView::content_shadow_height() const { | 795 int ToolbarView::content_shadow_height() const { |
773 return browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH ? | 796 return browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH ? |
774 kContentShadowHeightAsh : kContentShadowHeight; | 797 kContentShadowHeightAsh : kContentShadowHeight; |
775 } | 798 } |
OLD | NEW |