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

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

Issue 1100223002: Update {virtual,override} to follow C++11 style in chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 8 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
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_aura.h" 8 #include "chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.h"
9 9
10 namespace web_app { 10 namespace web_app {
(...skipping 16 matching lines...) Expand all
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();
35 35
36 // Overridden from ChromeNativeAppWindowViews: 36 // Overridden from ChromeNativeAppWindowViews:
37 virtual void OnBeforeWidgetInit( 37 void OnBeforeWidgetInit(
38 const extensions::AppWindow::CreateParams& create_params, 38 const extensions::AppWindow::CreateParams& create_params,
39 views::Widget::InitParams* init_params, 39 views::Widget::InitParams* init_params,
40 views::Widget* widget) override; 40 views::Widget* widget) override;
41 virtual void InitializeDefaultWindow( 41 void InitializeDefaultWindow(
42 const extensions::AppWindow::CreateParams& create_params) override; 42 const extensions::AppWindow::CreateParams& create_params) override;
43 virtual views::NonClientFrameView* CreateStandardDesktopAppFrame() override; 43 views::NonClientFrameView* CreateStandardDesktopAppFrame() override;
44 44
45 // Overridden from ui::BaseWindow: 45 // Overridden from ui::BaseWindow:
46 virtual void Show() override; 46 void Show() override;
47 virtual void Activate() override; 47 void Activate() override;
48 48
49 // Overridden from views::WidgetDelegate: 49 // Overridden from views::WidgetDelegate:
50 bool CanMinimize() const override; 50 bool CanMinimize() const override;
51 51
52 // Overridden from extensions::NativeAppWindow: 52 // Overridden from extensions::NativeAppWindow:
53 virtual void UpdateShelfMenu() override; 53 void UpdateShelfMenu() override;
54 54
55 // Populated if there is a glass frame, which provides special information 55 // Populated if there is a glass frame, which provides special information
56 // to the native widget implementation. This will be NULL if there is no 56 // to the native widget implementation. This will be NULL if there is no
57 // glass frame. Note, this can change from NULL to non-NULL and back again 57 // glass frame. Note, this can change from NULL to non-NULL and back again
58 // throughout the life of a window, e.g. if DWM is enabled and disabled. 58 // throughout the life of a window, e.g. if DWM is enabled and disabled.
59 GlassAppWindowFrameViewWin* glass_frame_view_; 59 GlassAppWindowFrameViewWin* glass_frame_view_;
60 60
61 // The Windows Application User Model ID identifying the app. 61 // The Windows Application User Model ID identifying the app.
62 // Not set for windows running inside Ash. 62 // Not set for windows running inside Ash.
63 base::string16 app_model_id_; 63 base::string16 app_model_id_;
64 64
65 // Whether the InitParams indicated that this window should be translucent. 65 // Whether the InitParams indicated that this window should be translucent.
66 bool is_translucent_; 66 bool is_translucent_;
67 67
68 base::WeakPtrFactory<ChromeNativeAppWindowViewsWin> weak_ptr_factory_; 68 base::WeakPtrFactory<ChromeNativeAppWindowViewsWin> weak_ptr_factory_;
69 69
70 DISALLOW_COPY_AND_ASSIGN(ChromeNativeAppWindowViewsWin); 70 DISALLOW_COPY_AND_ASSIGN(ChromeNativeAppWindowViewsWin);
71 }; 71 };
72 72
73 #endif // CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_WIN_H_ 73 #endif // CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_WIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698