Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(447)

Side by Side Diff: chrome/browser/ui/cocoa/browser_window_utils.mm

Issue 10383239: Move NativeWebKeyboardEvent to the content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix mac Created 8 years, 7 months 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
OLDNEW
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/browser_window_utils.h" 5 #import "chrome/browser/ui/cocoa/browser_window_utils.h"
6 6
7 #include <Carbon/Carbon.h> 7 #include <Carbon/Carbon.h>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "chrome/app/chrome_command_ids.h" 10 #include "chrome/app/chrome_command_ids.h"
11 #include "chrome/browser/global_keyboard_shortcuts_mac.h" 11 #include "chrome/browser/global_keyboard_shortcuts_mac.h"
12 #include "chrome/browser/ui/browser.h" 12 #include "chrome/browser/ui/browser.h"
13 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" 13 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h"
14 #import "chrome/browser/ui/cocoa/nsmenuitem_additions.h" 14 #import "chrome/browser/ui/cocoa/nsmenuitem_additions.h"
15 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h" 15 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
16 #include "content/public/browser/native_web_keyboard_event.h" 16 #include "content/public/browser/native_web_keyboard_event.h"
17 17
18 using content::NativeWebKeyboardEvent;
19
18 @interface MenuWalker : NSObject 20 @interface MenuWalker : NSObject
19 + (NSMenuItem*)itemForKeyEquivalent:(NSEvent*)key 21 + (NSMenuItem*)itemForKeyEquivalent:(NSEvent*)key
20 menu:(NSMenu*)menu; 22 menu:(NSMenu*)menu;
21 @end 23 @end
22 24
23 @implementation MenuWalker 25 @implementation MenuWalker
24 + (NSMenuItem*)itemForKeyEquivalent:(NSEvent*)key 26 + (NSMenuItem*)itemForKeyEquivalent:(NSEvent*)key
25 menu:(NSMenu*)menu { 27 menu:(NSMenu*)menu {
26 NSMenuItem* result = nil; 28 NSMenuItem* result = nil;
27 29
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 + (void)activateWindowForController:(NSWindowController*)controller { 182 + (void)activateWindowForController:(NSWindowController*)controller {
181 // Per http://crbug.com/73779 and http://crbug.com/75223, we need this to 183 // Per http://crbug.com/73779 and http://crbug.com/75223, we need this to
182 // properly activate windows if Chrome is not the active application. 184 // properly activate windows if Chrome is not the active application.
183 [[controller window] makeKeyAndOrderFront:controller]; 185 [[controller window] makeKeyAndOrderFront:controller];
184 ProcessSerialNumber psn; 186 ProcessSerialNumber psn;
185 GetCurrentProcess(&psn); 187 GetCurrentProcess(&psn);
186 SetFrontProcessWithOptions(&psn, kSetFrontProcessFrontWindowOnly); 188 SetFrontProcessWithOptions(&psn, kSetFrontProcessFrontWindowOnly);
187 } 189 }
188 190
189 @end 191 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_utils.h ('k') | chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698