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" |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
97 }; | 97 }; |
98 | 98 |
99 } // namespace WrenchMenuControllerInternal | 99 } // namespace WrenchMenuControllerInternal |
100 | 100 |
101 @implementation WrenchMenuController | 101 @implementation WrenchMenuController |
102 | 102 |
103 - (id)initWithBrowser:(Browser*)browser { | 103 - (id)initWithBrowser:(Browser*)browser { |
104 if ((self = [super init])) { | 104 if ((self = [super init])) { |
105 browser_ = browser; | 105 browser_ = browser; |
106 observer_.reset(new WrenchMenuControllerInternal::ZoomLevelObserver( | 106 observer_.reset(new WrenchMenuControllerInternal::ZoomLevelObserver( |
107 self, content::HostZoomMap::GetForBrowserContext(browser->profile()))); | 107 self, |
| 108 content::HostZoomMap::GetDefaultForBrowserContext(browser->profile()))); |
108 acceleratorDelegate_.reset( | 109 acceleratorDelegate_.reset( |
109 new WrenchMenuControllerInternal::AcceleratorDelegate()); | 110 new WrenchMenuControllerInternal::AcceleratorDelegate()); |
110 [self createModel]; | 111 [self createModel]; |
111 } | 112 } |
112 return self; | 113 return self; |
113 } | 114 } |
114 | 115 |
115 - (void)addItemToMenu:(NSMenu*)menu | 116 - (void)addItemToMenu:(NSMenu*)menu |
116 atIndex:(NSInteger)index | 117 atIndex:(NSInteger)index |
117 fromModel:(ui::MenuModel*)model { | 118 fromModel:(ui::MenuModel*)model { |
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
410 controller_ = controller; | 411 controller_ = controller; |
411 } | 412 } |
412 return self; | 413 return self; |
413 } | 414 } |
414 | 415 |
415 - (IBAction)dispatchWrenchMenuCommand:(id)sender { | 416 - (IBAction)dispatchWrenchMenuCommand:(id)sender { |
416 [controller_ dispatchWrenchMenuCommand:sender]; | 417 [controller_ dispatchWrenchMenuCommand:sender]; |
417 } | 418 } |
418 | 419 |
419 @end // @implementation WrenchMenuButtonViewController | 420 @end // @implementation WrenchMenuButtonViewController |
OLD | NEW |