| Index: chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h
|
| diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h b/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h
|
| index d665eda24fa3b0e19c8288cdd4854b8b7ac15216..1218b97cc064ba4de8ac8a22d9f0b967c4074ded 100644
|
| --- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h
|
| +++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h
|
| @@ -8,12 +8,20 @@
|
| #include "chrome/browser/shell_integration.h"
|
| #include "chrome/browser/ui/views/apps/chrome_native_app_window_views.h"
|
|
|
| +namespace apps {
|
| +class GlassAppWindowFrameView;
|
| +}
|
| +
|
| // Windows-specific parts of the views-backed native shell window implementation
|
| // for packaged apps.
|
| class ChromeNativeAppWindowViewsWin : public ChromeNativeAppWindowViews {
|
| public:
|
| ChromeNativeAppWindowViewsWin();
|
|
|
| + apps::GlassAppWindowFrameView* glass_frame_view() {
|
| + return glass_frame_view_;
|
| + };
|
| +
|
| private:
|
| void ActivateParentDesktopIfNecessary();
|
|
|
| @@ -27,6 +35,8 @@ class ChromeNativeAppWindowViewsWin : public ChromeNativeAppWindowViews {
|
| views::Widget* widget) OVERRIDE;
|
| virtual void InitializeDefaultWindow(
|
| const apps::AppWindow::CreateParams& create_params) OVERRIDE;
|
| + virtual views::NonClientFrameView* CreateStandardAppWindowFrame() OVERRIDE;
|
| + virtual apps::AppWindowFrameView* CreateNonStandardAppWindowFrame() OVERRIDE;
|
|
|
| // Overridden from ui::BaseWindow:
|
| virtual void Show() OVERRIDE;
|
| @@ -37,6 +47,12 @@ class ChromeNativeAppWindowViewsWin : public ChromeNativeAppWindowViews {
|
|
|
| base::WeakPtrFactory<ChromeNativeAppWindowViewsWin> weak_ptr_factory_;
|
|
|
| + // Populated if there is a glass frame, which provides special information
|
| + // to the native widget implementation. This will be NULL if there is no
|
| + // glass frame. Note, this can change from NULL to non-NULL and back again
|
| + // throughout the life of a window, e.g. if DWM is enabled and disabled.
|
| + apps::GlassAppWindowFrameView* glass_frame_view_;
|
| +
|
| // The Windows Application User Model ID identifying the app.
|
| base::string16 app_model_id_;
|
|
|
|
|