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

Side by Side Diff: content/shell/browser/shell_mac.mm

Issue 322623002: Consolidate SDK forwards in sdk_forward_declarations.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nit Created 6 years, 6 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
« no previous file with comments | « content/common/cursors/webcursor_mac.mm ('k') | device/bluetooth/bluetooth_adapter_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include "content/shell/browser/shell.h" 5 #include "content/shell/browser/shell.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #import "base/mac/scoped_nsobject.h" 10 #import "base/mac/scoped_nsobject.h"
11 #include "base/mac/sdk_forward_declarations.h"
11 #include "base/strings/string_piece.h" 12 #include "base/strings/string_piece.h"
12 #include "base/strings/sys_string_conversions.h" 13 #include "base/strings/sys_string_conversions.h"
13 #include "content/public/browser/native_web_keyboard_event.h" 14 #include "content/public/browser/native_web_keyboard_event.h"
14 #include "content/public/browser/web_contents.h" 15 #include "content/public/browser/web_contents.h"
15 #include "content/shell/app/resource.h" 16 #include "content/shell/app/resource.h"
16 #import "ui/base/cocoa/underlay_opengl_hosting_window.h" 17 #import "ui/base/cocoa/underlay_opengl_hosting_window.h"
17 #include "url/gurl.h" 18 #include "url/gurl.h"
18 19
19 #if !defined(MAC_OS_X_VERSION_10_7) || \
20 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
21
22 enum {
23 NSWindowCollectionBehaviorFullScreenPrimary = 1 << 7,
24 NSWindowCollectionBehaviorFullScreenAuxiliary = 1 << 8
25 };
26
27 #endif // MAC_OS_X_VERSION_10_7
28
29 // Receives notification that the window is closing so that it can start the 20 // Receives notification that the window is closing so that it can start the
30 // tear-down process. Is responsible for deleting itself when done. 21 // tear-down process. Is responsible for deleting itself when done.
31 @interface ContentShellWindowDelegate : NSObject<NSWindowDelegate> { 22 @interface ContentShellWindowDelegate : NSObject<NSWindowDelegate> {
32 @private 23 @private
33 content::Shell* shell_; 24 content::Shell* shell_;
34 } 25 }
35 - (id)initWithShell:(content::Shell*)shell; 26 - (id)initWithShell:(content::Shell*)shell;
36 @end 27 @end
37 28
38 @implementation ContentShellWindowDelegate 29 @implementation ContentShellWindowDelegate
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 [[event.os_event characters] isEqual:@"l"]) { 334 [[event.os_event characters] isEqual:@"l"]) {
344 [window_ makeFirstResponder:url_edit_view_]; 335 [window_ makeFirstResponder:url_edit_view_];
345 return; 336 return;
346 } 337 }
347 338
348 [[NSApp mainMenu] performKeyEquivalent:event.os_event]; 339 [[NSApp mainMenu] performKeyEquivalent:event.os_event];
349 } 340 }
350 } 341 }
351 342
352 } // namespace content 343 } // namespace content
OLDNEW
« no previous file with comments | « content/common/cursors/webcursor_mac.mm ('k') | device/bluetooth/bluetooth_adapter_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698