Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_WIN_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_WIN_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_WIN_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_WIN_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 namespace web_app { | 10 namespace web_app { |
| 11 struct ShortcutInfo; | 11 struct ShortcutInfo; |
| 12 } | 12 } |
| 13 | 13 |
| 14 class GlassAppWindowFrameViewWin; | 14 class GlassAppWindowFrameViewWin; |
| 15 | 15 |
| 16 // Windows-specific parts of the views-backed native shell window implementation | 16 // Windows-specific parts of the views-backed native shell window implementation |
| 17 // for packaged apps. | 17 // for packaged apps. |
| 18 class ChromeNativeAppWindowViewsWin : public ChromeNativeAppWindowViews { | 18 class ChromeNativeAppWindowViewsWin : public ChromeNativeAppWindowViews { |
| 19 public: | 19 public: |
| 20 ChromeNativeAppWindowViewsWin(); | 20 ChromeNativeAppWindowViewsWin(); |
| 21 | 21 |
| 22 GlassAppWindowFrameViewWin* glass_frame_view() { | 22 GlassAppWindowFrameViewWin* glass_frame_view() { |
| 23 return glass_frame_view_; | 23 return glass_frame_view_; |
| 24 }; | 24 } |
|
levin
2014/07/15 20:40:05
Please consider removing this part of the change f
jackhou1
2014/07/16 01:26:29
Done.
| |
| 25 | 25 |
| 26 private: | 26 private: |
| 27 void ActivateParentDesktopIfNecessary(); | 27 void ActivateParentDesktopIfNecessary(); |
| 28 | 28 |
| 29 void OnShortcutInfoLoaded( | 29 void OnShortcutInfoLoaded( |
| 30 const web_app::ShortcutInfo& shortcut_info); | 30 const web_app::ShortcutInfo& shortcut_info); |
| 31 | 31 |
| 32 HWND GetNativeAppWindowHWND() const; | 32 HWND GetNativeAppWindowHWND() const; |
| 33 bool IsRunningInAsh(); | 33 bool IsRunningInAsh(); |
| 34 void EnsureCaptionStyleSet(); | 34 void EnsureCaptionStyleSet(); |
| (...skipping 20 matching lines...) Expand all Loading... | |
| 55 // throughout the life of a window, e.g. if DWM is enabled and disabled. | 55 // throughout the life of a window, e.g. if DWM is enabled and disabled. |
| 56 GlassAppWindowFrameViewWin* glass_frame_view_; | 56 GlassAppWindowFrameViewWin* glass_frame_view_; |
| 57 | 57 |
| 58 // The Windows Application User Model ID identifying the app. | 58 // The Windows Application User Model ID identifying the app. |
| 59 base::string16 app_model_id_; | 59 base::string16 app_model_id_; |
| 60 | 60 |
| 61 DISALLOW_COPY_AND_ASSIGN(ChromeNativeAppWindowViewsWin); | 61 DISALLOW_COPY_AND_ASSIGN(ChromeNativeAppWindowViewsWin); |
| 62 }; | 62 }; |
| 63 | 63 |
| 64 #endif // CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_WIN_H_ | 64 #endif // CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_WIN_H_ |
| OLD | NEW |