Chromium Code Reviews| Index: extensions/browser/app_window/app_window.cc |
| diff --git a/extensions/browser/app_window/app_window.cc b/extensions/browser/app_window/app_window.cc |
| index c1959a98c82541c665e543ff7fba235de8b74b5f..992c8717108daad0cb3759c8571a7a43caffda69 100644 |
| --- a/extensions/browser/app_window/app_window.cc |
| +++ b/extensions/browser/app_window/app_window.cc |
| @@ -454,6 +454,22 @@ void AppWindow::OnNativeClose() { |
| } |
| void AppWindow::OnNativeWindowChanged() { |
| +#if defined(OS_MACOSX) |
|
tapted
2015/06/10 05:45:25
before this, I'd just do
if (!native_app_window
jackhou1
2015/06/10 07:52:32
Done.
|
| + // On Mac the user can change the window's fullscreen state. If that has |
| + // happened, update AppWindow's internal state. |
| + if (native_app_window_) { |
| + bool native_is_fullscreen = native_app_window_->IsFullscreen(); |
| + bool was_fullscreen = IsFullscreen(); |
| + if (native_is_fullscreen) |
| + fullscreen_types_ |= FULLSCREEN_TYPE_OS; |
| + else |
| + fullscreen_types_ = FULLSCREEN_TYPE_NONE; |
| + |
| + if (native_is_fullscreen != was_fullscreen && cached_always_on_top_) |
|
tapted
2015/06/10 05:45:25
I don't think the `native_is_fullscreen != was_ful
jackhou1
2015/06/10 07:52:32
Done.
|
| + UpdateNativeAlwaysOnTop(); // Same as in SetNativeWindowFullscreen. |
| + } |
| +#endif |
| + |
| SaveWindowPosition(); |
| #if defined(OS_WIN) |