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 #ifndef CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_MAC_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_MAC_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_MAC_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_MAC_H_ |
| 7 | 7 |
| 8 #include "chrome/browser/ui/views/apps/chrome_native_app_window_views.h" | 8 #include "chrome/browser/ui/views/apps/chrome_native_app_window_views.h" |
| 9 | 9 |
| 10 // Mac-specific parts of ChromeNativeAppWindowViews. | 10 // Mac-specific parts of ChromeNativeAppWindowViews. |
| (...skipping 10 matching lines...) Expand all Loading... | |
| 21 views::Widget* widget) override; | 21 views::Widget* widget) override; |
| 22 views::NonClientFrameView* CreateStandardDesktopAppFrame() override; | 22 views::NonClientFrameView* CreateStandardDesktopAppFrame() override; |
| 23 views::NonClientFrameView* CreateNonStandardAppFrame() override; | 23 views::NonClientFrameView* CreateNonStandardAppFrame() override; |
| 24 | 24 |
| 25 // ui::BaseWindow implementation. | 25 // ui::BaseWindow implementation. |
| 26 void Show() override; | 26 void Show() override; |
| 27 void ShowInactive() override; | 27 void ShowInactive() override; |
| 28 void Activate() override; | 28 void Activate() override; |
| 29 void FlashFrame(bool flash) override; | 29 void FlashFrame(bool flash) override; |
| 30 | 30 |
| 31 // WidgetObserver implementation. | |
| 32 void OnWidgetBoundsChanged(views::Widget* widget, | |
| 33 const gfx::Rect& new_bounds) override; | |
|
tapted
2015/06/09 06:04:01
nit: should come after NativeAppWindow, to match t
jackhou1
2015/06/10 05:06:03
Removed.
| |
| 34 | |
| 31 // NativeAppWindow implementation. | 35 // NativeAppWindow implementation. |
| 32 // These are used to simulate Mac-style hide/show. Since windows can be hidden | 36 // These are used to simulate Mac-style hide/show. Since windows can be hidden |
| 33 // and shown using the app.window API, this sets is_hidden_with_app_ to | 37 // and shown using the app.window API, this sets is_hidden_with_app_ to |
| 34 // differentiate the reason a window was hidden. | 38 // differentiate the reason a window was hidden. |
| 35 void ShowWithApp() override; | 39 void ShowWithApp() override; |
| 36 void HideWithApp() override; | 40 void HideWithApp() override; |
| 37 | 41 |
| 38 private: | 42 private: |
| 39 // Unset is_hidden_with_app_ and tell the shim to unhide. | 43 // Unset is_hidden_with_app_ and tell the shim to unhide. |
| 40 void UnhideWithoutActivation(); | 44 void UnhideWithoutActivation(); |
| 41 | 45 |
| 42 // Whether this window last became hidden due to a request to hide the entire | 46 // Whether this window last became hidden due to a request to hide the entire |
| 43 // app, e.g. via the dock menu or Cmd+H. This is set by Hide/ShowWithApp. | 47 // app, e.g. via the dock menu or Cmd+H. This is set by Hide/ShowWithApp. |
| 44 bool is_hidden_with_app_; | 48 bool is_hidden_with_app_; |
| 45 | 49 |
| 46 DISALLOW_COPY_AND_ASSIGN(ChromeNativeAppWindowViewsMac); | 50 DISALLOW_COPY_AND_ASSIGN(ChromeNativeAppWindowViewsMac); |
| 47 }; | 51 }; |
| 48 | 52 |
| 49 #endif // CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_MAC_H_ | 53 #endif // CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_MAC_H_ |
| OLD | NEW |