| 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/strings/string16.h" | 10 #include "base/strings/string16.h" |
| 11 #include "base/strings/sys_string_conversions.h" | 11 #include "base/strings/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/bookmarks/bookmark_menu_cocoa_controller.h" | 19 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h" |
| 20 #import "chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.h" | 20 #import "chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.h" |
| 21 #import "chrome/browser/ui/cocoa/l10n_util.h" | 21 #import "chrome/browser/ui/cocoa/l10n_util.h" |
| 22 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" | 22 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" |
| 23 #import "chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view.h" | 23 #import "chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view.h" |
| 24 #import "chrome/browser/ui/cocoa/wrench_menu/recent_tabs_menu_model_delegate.h" | 24 #import "chrome/browser/ui/cocoa/wrench_menu/recent_tabs_menu_model_delegate.h" |
| 25 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h" | 25 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h" |
| 26 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" | 26 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" |
| 27 #include "chrome/browser/ui/zoom/zoom_event_manager.h" | |
| 28 #include "chrome/grit/generated_resources.h" | 27 #include "chrome/grit/generated_resources.h" |
| 28 #include "components/ui/zoom/zoom_event_manager.h" |
| 29 #include "content/public/browser/user_metrics.h" | 29 #include "content/public/browser/user_metrics.h" |
| 30 #include "ui/base/l10n/l10n_util.h" | 30 #include "ui/base/l10n/l10n_util.h" |
| 31 #include "ui/base/models/menu_model.h" | 31 #include "ui/base/models/menu_model.h" |
| 32 | 32 |
| 33 namespace wrench_menu_controller { | 33 namespace wrench_menu_controller { |
| 34 const CGFloat kWrenchBubblePointOffsetY = 6; | 34 const CGFloat kWrenchBubblePointOffsetY = 6; |
| 35 } | 35 } |
| 36 | 36 |
| 37 using base::UserMetricsAction; | 37 using base::UserMetricsAction; |
| 38 | 38 |
| (...skipping 22 matching lines...) Expand all Loading... |
| 61 if (!accelerator) | 61 if (!accelerator) |
| 62 return false; | 62 return false; |
| 63 *out_accelerator = *accelerator; | 63 *out_accelerator = *accelerator; |
| 64 return true; | 64 return true; |
| 65 } | 65 } |
| 66 }; | 66 }; |
| 67 | 67 |
| 68 class ZoomLevelObserver { | 68 class ZoomLevelObserver { |
| 69 public: | 69 public: |
| 70 ZoomLevelObserver(WrenchMenuController* controller, | 70 ZoomLevelObserver(WrenchMenuController* controller, |
| 71 ZoomEventManager* manager) | 71 ui_zoom::ZoomEventManager* manager) |
| 72 : controller_(controller) { | 72 : controller_(controller) { |
| 73 subscription_ = manager->AddZoomLevelChangedCallback( | 73 subscription_ = manager->AddZoomLevelChangedCallback( |
| 74 base::Bind(&ZoomLevelObserver::OnZoomLevelChanged, | 74 base::Bind(&ZoomLevelObserver::OnZoomLevelChanged, |
| 75 base::Unretained(this))); | 75 base::Unretained(this))); |
| 76 } | 76 } |
| 77 | 77 |
| 78 ~ZoomLevelObserver() {} | 78 ~ZoomLevelObserver() {} |
| 79 | 79 |
| 80 private: | 80 private: |
| 81 void OnZoomLevelChanged(const content::HostZoomMap::ZoomLevelChange& change) { | 81 void OnZoomLevelChanged(const content::HostZoomMap::ZoomLevelChange& change) { |
| (...skipping 13 matching lines...) Expand all Loading... |
| 95 | 95 |
| 96 } // namespace WrenchMenuControllerInternal | 96 } // namespace WrenchMenuControllerInternal |
| 97 | 97 |
| 98 @implementation WrenchMenuController | 98 @implementation WrenchMenuController |
| 99 | 99 |
| 100 - (id)initWithBrowser:(Browser*)browser { | 100 - (id)initWithBrowser:(Browser*)browser { |
| 101 if ((self = [super init])) { | 101 if ((self = [super init])) { |
| 102 browser_ = browser; | 102 browser_ = browser; |
| 103 observer_.reset(new WrenchMenuControllerInternal::ZoomLevelObserver( | 103 observer_.reset(new WrenchMenuControllerInternal::ZoomLevelObserver( |
| 104 self, | 104 self, |
| 105 ZoomEventManager::GetForBrowserContext(browser->profile()))); | 105 ui_zoom::ZoomEventManager::GetForBrowserContext(browser->profile()))); |
| 106 acceleratorDelegate_.reset( | 106 acceleratorDelegate_.reset( |
| 107 new WrenchMenuControllerInternal::AcceleratorDelegate()); | 107 new WrenchMenuControllerInternal::AcceleratorDelegate()); |
| 108 [self createModel]; | 108 [self createModel]; |
| 109 } | 109 } |
| 110 return self; | 110 return self; |
| 111 } | 111 } |
| 112 | 112 |
| 113 - (void)addItemToMenu:(NSMenu*)menu | 113 - (void)addItemToMenu:(NSMenu*)menu |
| 114 atIndex:(NSInteger)index | 114 atIndex:(NSInteger)index |
| 115 fromModel:(ui::MenuModel*)model { | 115 fromModel:(ui::MenuModel*)model { |
| (...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 408 controller_ = controller; | 408 controller_ = controller; |
| 409 } | 409 } |
| 410 return self; | 410 return self; |
| 411 } | 411 } |
| 412 | 412 |
| 413 - (IBAction)dispatchWrenchMenuCommand:(id)sender { | 413 - (IBAction)dispatchWrenchMenuCommand:(id)sender { |
| 414 [controller_ dispatchWrenchMenuCommand:sender]; | 414 [controller_ dispatchWrenchMenuCommand:sender]; |
| 415 } | 415 } |
| 416 | 416 |
| 417 @end // @implementation WrenchMenuButtonViewController | 417 @end // @implementation WrenchMenuButtonViewController |
| OLD | NEW |