Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/views/apps/app_window_native_widget_mac.h" | 5 #include "chrome/browser/ui/views/apps/app_window_native_widget_mac.h" |
| 6 | 6 |
| 7 #import <Cocoa/Cocoa.h> | 7 #import <Cocoa/Cocoa.h> |
| 8 | 8 |
| 9 #import "chrome/browser/ui/cocoa/apps/titlebar_background_view.h" | 9 #import "chrome/browser/ui/cocoa/apps/titlebar_background_view.h" |
| 10 #include "chrome/browser/ui/views/apps/chrome_native_app_window_views.h" | |
| 10 #import "chrome/browser/ui/views/frame/native_widget_mac_frameless_nswindow.h" | 11 #import "chrome/browser/ui/views/frame/native_widget_mac_frameless_nswindow.h" |
| 12 #include "extensions/browser/app_window/app_window.h" | |
| 11 #include "extensions/browser/app_window/native_app_window.h" | 13 #include "extensions/browser/app_window/native_app_window.h" |
| 12 #import "ui/base/cocoa/window_size_constants.h" | 14 #import "ui/base/cocoa/window_size_constants.h" |
| 13 | 15 |
| 14 AppWindowNativeWidgetMac::AppWindowNativeWidgetMac( | 16 AppWindowNativeWidgetMac::AppWindowNativeWidgetMac( |
| 15 views::Widget* widget, | 17 views::Widget* widget, |
| 16 extensions::NativeAppWindow* native_app_window) | 18 ChromeNativeAppWindowViews* native_app_window) |
| 17 : NativeWidgetMac(widget), native_app_window_(native_app_window) { | 19 : NativeWidgetMac(widget), native_app_window_(native_app_window) { |
| 18 } | 20 } |
| 19 | 21 |
| 20 AppWindowNativeWidgetMac::~AppWindowNativeWidgetMac() { | 22 AppWindowNativeWidgetMac::~AppWindowNativeWidgetMac() { |
| 21 } | 23 } |
| 22 | 24 |
| 25 void AppWindowNativeWidgetMac::OnFullscreenTransitionComplete( | |
| 26 bool is_fullscreen) { | |
| 27 extensions::AppWindow* app_window = native_app_window_->app_window(); | |
| 28 if (is_fullscreen) | |
| 29 app_window->OSFullscreen(); | |
| 30 else | |
| 31 app_window->Restore(); | |
| 32 app_window->OnNativeWindowChanged(); | |
| 33 } | |
| 34 | |
| 23 NSWindow* AppWindowNativeWidgetMac::CreateNSWindow( | 35 NSWindow* AppWindowNativeWidgetMac::CreateNSWindow( |
| 24 const views::Widget::InitParams& params) { | 36 const views::Widget::InitParams& params) { |
| 37 extensions::NativeAppWindow* native_app_window = | |
| 38 static_cast<extensions::NativeAppWindow*>(native_app_window_); | |
|
tapted
2015/06/09 03:04:27
static_cast -> implicit_cast? (assuming this is ju
| |
| 25 // If the window has a native or colored frame, use the same NSWindow as | 39 // If the window has a native or colored frame, use the same NSWindow as |
| 26 // NativeWidgetMac. | 40 // NativeWidgetMac. |
| 27 if (!native_app_window_->IsFrameless()) { | 41 if (!native_app_window->IsFrameless()) { |
| 28 NSWindow* ns_window = NativeWidgetMac::CreateNSWindow(params); | 42 NSWindow* ns_window = NativeWidgetMac::CreateNSWindow(params); |
| 29 if (native_app_window_->HasFrameColor()) { | 43 if (native_app_window->HasFrameColor()) { |
| 30 [TitlebarBackgroundView | 44 [TitlebarBackgroundView |
| 31 addToNSWindow:ns_window | 45 addToNSWindow:ns_window |
| 32 activeColor:native_app_window_->ActiveFrameColor() | 46 activeColor:native_app_window->ActiveFrameColor() |
| 33 inactiveColor:native_app_window_->InactiveFrameColor()]; | 47 inactiveColor:native_app_window->InactiveFrameColor()]; |
| 34 } | 48 } |
| 35 return ns_window; | 49 return ns_window; |
| 36 } | 50 } |
| 37 | 51 |
| 38 // NSTexturedBackgroundWindowMask is needed to implement draggable window | 52 // NSTexturedBackgroundWindowMask is needed to implement draggable window |
| 39 // regions. | 53 // regions. |
| 40 NSUInteger style_mask = NSTexturedBackgroundWindowMask | NSTitledWindowMask | | 54 NSUInteger style_mask = NSTexturedBackgroundWindowMask | NSTitledWindowMask | |
| 41 NSClosableWindowMask | NSMiniaturizableWindowMask | | 55 NSClosableWindowMask | NSMiniaturizableWindowMask | |
| 42 NSResizableWindowMask; | 56 NSResizableWindowMask; |
| 43 return [[[NativeWidgetMacFramelessNSWindow alloc] | 57 return [[[NativeWidgetMacFramelessNSWindow alloc] |
| 44 initWithContentRect:ui::kWindowSizeDeterminedLater | 58 initWithContentRect:ui::kWindowSizeDeterminedLater |
| 45 styleMask:style_mask | 59 styleMask:style_mask |
| 46 backing:NSBackingStoreBuffered | 60 backing:NSBackingStoreBuffered |
| 47 defer:NO] autorelease]; | 61 defer:NO] autorelease]; |
| 48 } | 62 } |
| OLD | NEW |