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

Unified Diff: chrome/browser/ui/views/apps/app_window_native_widget_mac.mm

Issue 1172483003: [MacViews] Update AppWindow when the native window changes fullscreen state. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@views
Patch Set: Created 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/apps/app_window_native_widget_mac.mm
diff --git a/chrome/browser/ui/views/apps/app_window_native_widget_mac.mm b/chrome/browser/ui/views/apps/app_window_native_widget_mac.mm
index 1bab9b8373373bc19105d504b911f2a1fee03e52..29b51c2d6145627a8c009c0ed23b1a94aabf99c6 100644
--- a/chrome/browser/ui/views/apps/app_window_native_widget_mac.mm
+++ b/chrome/browser/ui/views/apps/app_window_native_widget_mac.mm
@@ -7,30 +7,44 @@
#import <Cocoa/Cocoa.h>
#import "chrome/browser/ui/cocoa/apps/titlebar_background_view.h"
+#include "chrome/browser/ui/views/apps/chrome_native_app_window_views.h"
#import "chrome/browser/ui/views/frame/native_widget_mac_frameless_nswindow.h"
+#include "extensions/browser/app_window/app_window.h"
#include "extensions/browser/app_window/native_app_window.h"
#import "ui/base/cocoa/window_size_constants.h"
AppWindowNativeWidgetMac::AppWindowNativeWidgetMac(
views::Widget* widget,
- extensions::NativeAppWindow* native_app_window)
+ ChromeNativeAppWindowViews* native_app_window)
: NativeWidgetMac(widget), native_app_window_(native_app_window) {
}
AppWindowNativeWidgetMac::~AppWindowNativeWidgetMac() {
}
+void AppWindowNativeWidgetMac::OnFullscreenTransitionComplete(
+ bool is_fullscreen) {
+ extensions::AppWindow* app_window = native_app_window_->app_window();
+ if (is_fullscreen)
+ app_window->OSFullscreen();
+ else
+ app_window->Restore();
+ app_window->OnNativeWindowChanged();
+}
+
NSWindow* AppWindowNativeWidgetMac::CreateNSWindow(
const views::Widget::InitParams& params) {
+ extensions::NativeAppWindow* native_app_window =
+ static_cast<extensions::NativeAppWindow*>(native_app_window_);
tapted 2015/06/09 03:04:27 static_cast -> implicit_cast? (assuming this is ju
// If the window has a native or colored frame, use the same NSWindow as
// NativeWidgetMac.
- if (!native_app_window_->IsFrameless()) {
+ if (!native_app_window->IsFrameless()) {
NSWindow* ns_window = NativeWidgetMac::CreateNSWindow(params);
- if (native_app_window_->HasFrameColor()) {
+ if (native_app_window->HasFrameColor()) {
[TitlebarBackgroundView
addToNSWindow:ns_window
- activeColor:native_app_window_->ActiveFrameColor()
- inactiveColor:native_app_window_->InactiveFrameColor()];
+ activeColor:native_app_window->ActiveFrameColor()
+ inactiveColor:native_app_window->InactiveFrameColor()];
}
return ns_window;
}
« no previous file with comments | « chrome/browser/ui/views/apps/app_window_native_widget_mac.h ('k') | ui/views/cocoa/bridged_native_widget.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698