chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm - Issue 8695005: Move accelerator related files to ui/base/accelerators

Side by Side Diff: chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm

Issue 8695005: Move accelerator related files to ui/base/accelerators (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/cocoa/menu_controller.mm ('k') | chrome/browser/ui/find_bar/find_bar_host_browsertest.cc » ('j') | no next file with comments »

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/mac_util.h"	8 #include "base/mac/mac_util.h"

9 #include "base/string16.h"	9 #include "base/string16.h"

10 #include "base/sys_string_conversions.h"	10 #include "base/sys_string_conversions.h"

11 #include "chrome/app/chrome_command_ids.h"	11 #include "chrome/app/chrome_command_ids.h"

12 #import "chrome/browser/app_controller_mac.h"	12 #import "chrome/browser/app_controller_mac.h"

	13 #include "chrome/browser/profiles/profile.h"

13 #include "chrome/browser/ui/browser.h"	14 #include "chrome/browser/ui/browser.h"

14 #include "chrome/browser/ui/browser_window.h"	15 #include "chrome/browser/ui/browser_window.h"

15 #import "chrome/browser/ui/cocoa/accelerators_cocoa.h"	16 #import "chrome/browser/ui/cocoa/accelerators_cocoa.h"

16 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"	17 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"

17 #import "chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.h"	18 #import "chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.h"

18 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"	19 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"

19 #import "chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view.h"	20 #import "chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view.h"

20 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"	21 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"

21 #include "chrome/browser/profiles/profile.h"

22 #include "content/browser/user_metrics.h"	22 #include "content/browser/user_metrics.h"

23 #include "content/public/browser/notification_observer.h"	23 #include "content/public/browser/notification_observer.h"

24 #include "content/public/browser/notification_service.h"	24 #include "content/public/browser/notification_service.h"

25 #include "content/public/browser/notification_source.h"	25 #include "content/public/browser/notification_source.h"

26 #include "content/public/browser/notification_types.h"	26 #include "content/public/browser/notification_types.h"

27 #include "grit/chromium_strings.h"	27 #include "grit/chromium_strings.h"

28 #include "grit/generated_resources.h"	28 #include "grit/generated_resources.h"

	29 #include "ui/base/accelerators/accelerator_cocoa.h"

29 #include "ui/base/l10n/l10n_util.h"	30 #include "ui/base/l10n/l10n_util.h"

30 #include "ui/base/models/accelerator_cocoa.h"

31 #include "ui/base/models/menu_model.h"	31 #include "ui/base/models/menu_model.h"

32	32

33 @interface WrenchMenuController (Private)	33 @interface WrenchMenuController (Private)

34 - (void)createModel;	34 - (void)createModel;

35 - (void)adjustPositioning;	35 - (void)adjustPositioning;

36 - (void)performCommandDispatch:(NSNumber*)tag;	36 - (void)performCommandDispatch:(NSNumber*)tag;

37 - (NSButton*)zoomDisplay;	37 - (NSButton*)zoomDisplay;

38 - (void)removeAllItems:(NSMenu*)menu;	38 - (void)removeAllItems:(NSMenu*)menu;

39 @end	39 @end

40	40

(...skipping 282 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
323 controller_ = controller;	323 controller_ = controller;

324 }	324 }

325 return self;	325 return self;

326 }	326 }

327	327

328 - (IBAction)dispatchWrenchMenuCommand:(id)sender {	328 - (IBAction)dispatchWrenchMenuCommand:(id)sender {

329 [controller_ dispatchWrenchMenuCommand:sender];	329 [controller_ dispatchWrenchMenuCommand:sender];

330 }	330 }

331	331

332 @end // @implementation WrenchMenuButtonViewController	332 @end // @implementation WrenchMenuButtonViewController

OLD	NEW