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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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:

Index: chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm

diff --git a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm

index bd4b9c1bc53acc0bd14963aab6b8f63484dd4a46..7ff900f7301624906e8cd3145710c850de69a08a 100644

--- a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm

+++ b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm

@@ -10,6 +10,7 @@

#include "base/sys_string_conversions.h"

#include "chrome/app/chrome_command_ids.h"

#import "chrome/browser/app_controller_mac.h"

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

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

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

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

@@ -18,7 +19,6 @@

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

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

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

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

#include "content/browser/user_metrics.h"

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

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

@@ -26,8 +26,8 @@

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

#include "grit/chromium_strings.h"

#include "grit/generated_resources.h"

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

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

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

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

@interface WrenchMenuController (Private)