| 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/native_app_window_cocoa.h" | 5 #include "chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.h" |
| 6 | 6 |
| 7 #include "base/mac/mac_util.h" | 7 #include "base/mac/mac_util.h" |
| 8 #include "base/strings/sys_string_conversions.h" | 8 #include "base/strings/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 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" | 11 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" |
| 12 #include "chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa
.h" | 12 #include "chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa
.h" |
| 13 #include "chrome/browser/ui/cocoa/extensions/extension_view_mac.h" | 13 #include "chrome/browser/ui/cocoa/extensions/extension_view_mac.h" |
| 14 #include "chrome/common/extensions/extension.h" | 14 #include "chrome/common/extensions/extension.h" |
| 15 #include "content/public/browser/native_web_keyboard_event.h" | 15 #include "content/public/browser/native_web_keyboard_event.h" |
| 16 #include "content/public/browser/notification_source.h" | 16 #include "content/public/browser/notification_source.h" |
| 17 #include "content/public/browser/notification_types.h" | 17 #include "content/public/browser/notification_types.h" |
| 18 #include "content/public/browser/render_widget_host_view.h" | 18 #include "content/public/browser/render_widget_host_view.h" |
| 19 #include "content/public/browser/web_contents.h" | 19 #include "content/public/browser/web_contents.h" |
| 20 #include "content/public/browser/web_contents_view.h" | 20 #include "content/public/browser/web_contents_view.h" |
| 21 #include "third_party/skia/include/core/SkRegion.h" | 21 #include "third_party/skia/include/core/SkRegion.h" |
| 22 | 22 |
| 23 using apps::ShellWindow; |
| 24 |
| 23 @interface NSWindow (NSPrivateApis) | 25 @interface NSWindow (NSPrivateApis) |
| 24 - (void)setBottomCornerRounded:(BOOL)rounded; | 26 - (void)setBottomCornerRounded:(BOOL)rounded; |
| 25 @end | 27 @end |
| 26 | 28 |
| 27 // Replicate specific 10.7 SDK declarations for building with prior SDKs. | 29 // Replicate specific 10.7 SDK declarations for building with prior SDKs. |
| 28 #if !defined(MAC_OS_X_VERSION_10_7) || \ | 30 #if !defined(MAC_OS_X_VERSION_10_7) || \ |
| 29 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 | 31 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 |
| 30 | 32 |
| 31 @interface NSWindow (LionSDKDeclarations) | 33 @interface NSWindow (LionSDKDeclarations) |
| 32 - (void)toggleFullScreen:(id)sender; | 34 - (void)toggleFullScreen:(id)sender; |
| (...skipping 788 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 821 CHECK(!window || [window isKindOfClass:[ShellNSWindow class]]); | 823 CHECK(!window || [window isKindOfClass:[ShellNSWindow class]]); |
| 822 return static_cast<ShellNSWindow*>(window); | 824 return static_cast<ShellNSWindow*>(window); |
| 823 } | 825 } |
| 824 | 826 |
| 825 // static | 827 // static |
| 826 NativeAppWindow* NativeAppWindow::Create( | 828 NativeAppWindow* NativeAppWindow::Create( |
| 827 ShellWindow* shell_window, | 829 ShellWindow* shell_window, |
| 828 const ShellWindow::CreateParams& params) { | 830 const ShellWindow::CreateParams& params) { |
| 829 return new NativeAppWindowCocoa(shell_window, params); | 831 return new NativeAppWindowCocoa(shell_window, params); |
| 830 } | 832 } |
| OLD | NEW |