| OLD | NEW |
| 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 "chrome/browser/ui/cocoa/extensions/shell_window_cocoa.h" | 5 #include "chrome/browser/ui/cocoa/extensions/shell_window_cocoa.h" |
| 6 | 6 |
| 7 #include "base/mac/mac_util.h" | 7 #include "base/mac/mac_util.h" |
| 8 #include "base/sys_string_conversions.h" | 8 #include "base/sys_string_conversions.h" |
| 9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
| 10 #include "chrome/browser/ui/cocoa/browser_window_utils.h" | 10 #include "chrome/browser/ui/cocoa/browser_window_utils.h" |
| 11 #include "chrome/browser/ui/cocoa/extensions/extension_view_mac.h" | 11 #include "chrome/browser/ui/cocoa/extensions/extension_view_mac.h" |
| 12 #include "chrome/common/extensions/extension.h" | 12 #include "chrome/common/extensions/extension.h" |
| 13 #include "content/public/browser/render_widget_host_view.h" | 13 #include "content/public/browser/render_widget_host_view.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 #import "ui/base/cocoa/underlay_opengl_hosting_window.h" | 16 #import "ui/base/cocoa/underlay_opengl_hosting_window.h" |
| 17 | 17 |
| 18 @interface NSWindow (NSPrivateApis) | 18 @interface NSWindow (NSPrivateApis) |
| 19 - (void)setBottomCornerRounded:(BOOL)rounded; | 19 - (void)setBottomCornerRounded:(BOOL)rounded; |
| 20 @end | 20 @end |
| 21 | 21 |
| 22 #if !defined(MAC_OS_X_VERSION_10_6) || \ | |
| 23 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 | |
| 24 | |
| 25 @interface NSWindow (SnowLeopardSDKDeclarations) | |
| 26 - (void)setStyleMask:(NSUInteger)styleMask; | |
| 27 @end | |
| 28 | |
| 29 #endif // MAC_OS_X_VERSION_10_6 | |
| 30 | |
| 31 // Replicate specific 10.7 SDK declarations for building with prior SDKs. | 22 // Replicate specific 10.7 SDK declarations for building with prior SDKs. |
| 32 #if !defined(MAC_OS_X_VERSION_10_7) || \ | 23 #if !defined(MAC_OS_X_VERSION_10_7) || \ |
| 33 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 | 24 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 |
| 34 | 25 |
| 35 @interface NSWindow (LionSDKDeclarations) | 26 @interface NSWindow (LionSDKDeclarations) |
| 36 - (void)toggleFullScreen:(id)sender; | 27 - (void)toggleFullScreen:(id)sender; |
| 37 @end | 28 @end |
| 38 | 29 |
| 39 #endif // MAC_OS_X_VERSION_10_7 | 30 #endif // MAC_OS_X_VERSION_10_7 |
| 40 | 31 |
| (...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 323 return [window_controller_ window]; | 314 return [window_controller_ window]; |
| 324 } | 315 } |
| 325 | 316 |
| 326 // static | 317 // static |
| 327 ShellWindow* ShellWindow::CreateImpl(Profile* profile, | 318 ShellWindow* ShellWindow::CreateImpl(Profile* profile, |
| 328 const extensions::Extension* extension, | 319 const extensions::Extension* extension, |
| 329 const GURL& url, | 320 const GURL& url, |
| 330 const ShellWindow::CreateParams& params) { | 321 const ShellWindow::CreateParams& params) { |
| 331 return new ShellWindowCocoa(profile, extension, url, params); | 322 return new ShellWindowCocoa(profile, extension, url, params); |
| 332 } | 323 } |
| OLD | NEW |