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

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

Issue 18868005: content: Migrate from googleurl/ includes to url/ ones. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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/shell/shell_layout_tests_android.cc ('k') | content/test/content_browser_test_utils.h » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/shell.h" 5 #include "content/shell/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/strings/string_piece.h" 11 #include "base/strings/string_piece.h"
12 #include "base/strings/sys_string_conversions.h" 12 #include "base/strings/sys_string_conversions.h"
13 #include "content/public/browser/native_web_keyboard_event.h" 13 #include "content/public/browser/native_web_keyboard_event.h"
14 #include "content/public/browser/web_contents.h" 14 #include "content/public/browser/web_contents.h"
15 #include "content/public/browser/web_contents_view.h" 15 #include "content/public/browser/web_contents_view.h"
16 #include "content/shell/app/resource.h" 16 #include "content/shell/app/resource.h"
17 #include "googleurl/src/gurl.h"
18 #import "ui/base/cocoa/underlay_opengl_hosting_window.h" 17 #import "ui/base/cocoa/underlay_opengl_hosting_window.h"
18 #include "url/gurl.h"
19 19
20 #if !defined(MAC_OS_X_VERSION_10_7) || \ 20 #if !defined(MAC_OS_X_VERSION_10_7) || \
21 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 21 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
22 22
23 enum { 23 enum {
24 NSWindowCollectionBehaviorFullScreenPrimary = 1 << 7, 24 NSWindowCollectionBehaviorFullScreenPrimary = 1 << 7,
25 NSWindowCollectionBehaviorFullScreenAuxiliary = 1 << 8 25 NSWindowCollectionBehaviorFullScreenAuxiliary = 1 << 8
26 }; 26 };
27 27
28 #endif // MAC_OS_X_VERSION_10_7 28 #endif // MAC_OS_X_VERSION_10_7
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 [[event.os_event characters] isEqual:@"l"]) { 315 [[event.os_event characters] isEqual:@"l"]) {
316 [window_ makeFirstResponder:url_edit_view_]; 316 [window_ makeFirstResponder:url_edit_view_];
317 return; 317 return;
318 } 318 }
319 319
320 [[NSApp mainMenu] performKeyEquivalent:event.os_event]; 320 [[NSApp mainMenu] performKeyEquivalent:event.os_event];
321 } 321 }
322 } 322 }
323 323
324 } // namespace content 324 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/shell_layout_tests_android.cc ('k') | content/test/content_browser_test_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698