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