| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h" | 5 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/mac/bundle_locations.h" | 8 #include "base/mac/bundle_locations.h" |
| 9 #include "base/mac/mac_util.h" | 9 #include "base/mac/mac_util.h" |
| 10 #include "base/string16.h" | 10 #include "base/string16.h" |
| 11 #include "base/sys_string_conversions.h" | 11 #include "base/sys_string_conversions.h" |
| 12 #include "chrome/app/chrome_command_ids.h" | 12 #include "chrome/app/chrome_command_ids.h" |
| 13 #import "chrome/browser/app_controller_mac.h" | 13 #import "chrome/browser/app_controller_mac.h" |
| 14 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
| 15 #include "chrome/browser/ui/browser.h" | 15 #include "chrome/browser/ui/browser.h" |
| 16 #include "chrome/browser/ui/browser_window.h" | 16 #include "chrome/browser/ui/browser_window.h" |
| 17 #import "chrome/browser/ui/cocoa/accelerators_cocoa.h" | 17 #import "chrome/browser/ui/cocoa/accelerators_cocoa.h" |
| 18 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h" | 18 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h" |
| 19 #import "chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.h" | 19 #import "chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.h" |
| 20 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" | 20 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" |
| 21 #import "chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view.h" | 21 #import "chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view.h" |
| 22 #import "chrome/browser/ui/cocoa/wrench_menu/recent_tabs_menu_model_delegate.h" | 22 #import "chrome/browser/ui/cocoa/wrench_menu/recent_tabs_menu_model_delegate.h" |
| 23 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h" | 23 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h" |
| 24 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" | 24 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" |
| 25 #include "content/public/browser/host_zoom_map.h" | 25 #include "content/public/browser/host_zoom_map.h" |
| 26 #include "content/public/browser/notification_observer.h" | |
| 27 #include "content/public/browser/notification_service.h" | |
| 28 #include "content/public/browser/notification_source.h" | |
| 29 #include "content/public/browser/notification_types.h" | |
| 30 #include "content/public/browser/user_metrics.h" | 26 #include "content/public/browser/user_metrics.h" |
| 31 #include "grit/chromium_strings.h" | 27 #include "grit/chromium_strings.h" |
| 32 #include "grit/generated_resources.h" | 28 #include "grit/generated_resources.h" |
| 33 #include "ui/base/l10n/l10n_util.h" | 29 #include "ui/base/l10n/l10n_util.h" |
| 34 #include "ui/base/models/menu_model.h" | 30 #include "ui/base/models/menu_model.h" |
| 35 | 31 |
| 36 using content::HostZoomMap; | 32 using content::HostZoomMap; |
| 37 using content::UserMetricsAction; | 33 using content::UserMetricsAction; |
| 38 | 34 |
| 39 @interface WrenchMenuController (Private) | 35 @interface WrenchMenuController (Private) |
| (...skipping 17 matching lines...) Expand all Loading... |
| 57 AcceleratorsCocoa* keymap = AcceleratorsCocoa::GetInstance(); | 53 AcceleratorsCocoa* keymap = AcceleratorsCocoa::GetInstance(); |
| 58 const ui::Accelerator* accelerator = | 54 const ui::Accelerator* accelerator = |
| 59 keymap->GetAcceleratorForCommand(command_id); | 55 keymap->GetAcceleratorForCommand(command_id); |
| 60 if (!accelerator) | 56 if (!accelerator) |
| 61 return false; | 57 return false; |
| 62 *out_accelerator = *accelerator; | 58 *out_accelerator = *accelerator; |
| 63 return true; | 59 return true; |
| 64 } | 60 } |
| 65 }; | 61 }; |
| 66 | 62 |
| 67 class ZoomLevelObserver : public content::NotificationObserver { | 63 class ZoomLevelObserver : public content::HostZoomMap::Observer { |
| 68 public: | 64 public: |
| 69 explicit ZoomLevelObserver(WrenchMenuController* controller) | 65 ZoomLevelObserver(WrenchMenuController* controller, |
| 70 : controller_(controller) { | 66 content::HostZoomMap* map) |
| 71 registrar_.Add( | 67 : content::HostZoomMap::Observer(map), |
| 72 this, content::NOTIFICATION_ZOOM_LEVEL_CHANGED, | 68 controller_(controller) { |
| 73 content::NotificationService::AllBrowserContextsAndSources()); | |
| 74 } | 69 } |
| 75 | 70 |
| 76 void Observe(int type, | 71 virtual void OnZoomLevelChanged(const std::string& host) OVERRIDE { |
| 77 const content::NotificationSource& source, | |
| 78 const content::NotificationDetails& details) { | |
| 79 DCHECK_EQ(type, content::NOTIFICATION_ZOOM_LEVEL_CHANGED); | |
| 80 WrenchMenuModel* wrenchMenuModel = [controller_ wrenchMenuModel]; | 72 WrenchMenuModel* wrenchMenuModel = [controller_ wrenchMenuModel]; |
| 81 if (HostZoomMap::GetForBrowserContext( | |
| 82 wrenchMenuModel->browser()->profile()) != | |
| 83 content::Source<HostZoomMap>(source).ptr()) { | |
| 84 return; | |
| 85 } | |
| 86 | |
| 87 wrenchMenuModel->UpdateZoomControls(); | 73 wrenchMenuModel->UpdateZoomControls(); |
| 88 const string16 level = | 74 const string16 level = |
| 89 wrenchMenuModel->GetLabelForCommandId(IDC_ZOOM_PERCENT_DISPLAY); | 75 wrenchMenuModel->GetLabelForCommandId(IDC_ZOOM_PERCENT_DISPLAY); |
| 90 [[controller_ zoomDisplay] setTitle:SysUTF16ToNSString(level)]; | 76 [[controller_ zoomDisplay] setTitle:SysUTF16ToNSString(level)]; |
| 91 } | 77 } |
| 92 | 78 |
| 93 private: | 79 private: |
| 94 content::NotificationRegistrar registrar_; | |
| 95 WrenchMenuController* controller_; // Weak; owns this. | 80 WrenchMenuController* controller_; // Weak; owns this. |
| 81 |
| 82 DISALLOW_COPY_AND_ASSIGN(ZoomLevelObserver); |
| 96 }; | 83 }; |
| 97 | 84 |
| 98 } // namespace WrenchMenuControllerInternal | 85 } // namespace WrenchMenuControllerInternal |
| 99 | 86 |
| 100 @implementation WrenchMenuController | 87 @implementation WrenchMenuController |
| 101 | 88 |
| 102 - (id)initWithBrowser:(Browser*)browser { | 89 - (id)initWithBrowser:(Browser*)browser { |
| 103 if ((self = [super init])) { | 90 if ((self = [super init])) { |
| 104 browser_ = browser; | 91 browser_ = browser; |
| 105 observer_.reset(new WrenchMenuControllerInternal::ZoomLevelObserver(self)); | 92 observer_.reset(new WrenchMenuControllerInternal::ZoomLevelObserver( |
| 93 self, content::HostZoomMap::GetForBrowserContext(browser->profile()))); |
| 106 acceleratorDelegate_.reset( | 94 acceleratorDelegate_.reset( |
| 107 new WrenchMenuControllerInternal::AcceleratorDelegate()); | 95 new WrenchMenuControllerInternal::AcceleratorDelegate()); |
| 108 [self createModel]; | 96 [self createModel]; |
| 109 } | 97 } |
| 110 return self; | 98 return self; |
| 111 } | 99 } |
| 112 | 100 |
| 113 - (void)addItemToMenu:(NSMenu*)menu | 101 - (void)addItemToMenu:(NSMenu*)menu |
| 114 atIndex:(NSInteger)index | 102 atIndex:(NSInteger)index |
| 115 fromModel:(ui::MenuModel*)model { | 103 fromModel:(ui::MenuModel*)model { |
| (...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 359 controller_ = controller; | 347 controller_ = controller; |
| 360 } | 348 } |
| 361 return self; | 349 return self; |
| 362 } | 350 } |
| 363 | 351 |
| 364 - (IBAction)dispatchWrenchMenuCommand:(id)sender { | 352 - (IBAction)dispatchWrenchMenuCommand:(id)sender { |
| 365 [controller_ dispatchWrenchMenuCommand:sender]; | 353 [controller_ dispatchWrenchMenuCommand:sender]; |
| 366 } | 354 } |
| 367 | 355 |
| 368 @end // @implementation WrenchMenuButtonViewController | 356 @end // @implementation WrenchMenuButtonViewController |
| OLD | NEW |