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

Side by Side Diff: chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h

Issue 346713002: Don't set app window WS_CAPTION style when running in ash mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 {
(...skipping 12 matching lines...) Expand all
23 return glass_frame_view_; 23 return glass_frame_view_;
24 }; 24 };
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 void EnsureCaptionStyleSet(); 34 void EnsureCaptionStyleSet();
34 35
35 // Overridden from ChromeNativeAppWindowViews: 36 // Overridden from ChromeNativeAppWindowViews:
36 virtual void OnBeforeWidgetInit(views::Widget::InitParams* init_params, 37 virtual void OnBeforeWidgetInit(views::Widget::InitParams* init_params,
37 views::Widget* widget) OVERRIDE; 38 views::Widget* widget) OVERRIDE;
38 virtual void InitializeDefaultWindow( 39 virtual void InitializeDefaultWindow(
39 const apps::AppWindow::CreateParams& create_params) OVERRIDE; 40 const apps::AppWindow::CreateParams& create_params) OVERRIDE;
40 virtual views::NonClientFrameView* CreateStandardDesktopAppFrame() OVERRIDE; 41 virtual views::NonClientFrameView* CreateStandardDesktopAppFrame() OVERRIDE;
41 42
42 // Overridden from ui::BaseWindow: 43 // Overridden from ui::BaseWindow:
(...skipping 11 matching lines...) Expand all
54 // 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.
55 GlassAppWindowFrameViewWin* glass_frame_view_; 56 GlassAppWindowFrameViewWin* glass_frame_view_;
56 57
57 // The Windows Application User Model ID identifying the app. 58 // The Windows Application User Model ID identifying the app.
58 base::string16 app_model_id_; 59 base::string16 app_model_id_;
59 60
60 DISALLOW_COPY_AND_ASSIGN(ChromeNativeAppWindowViewsWin); 61 DISALLOW_COPY_AND_ASSIGN(ChromeNativeAppWindowViewsWin);
61 }; 62 };
62 63
63 #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_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698