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

Side by Side Diff: chrome/browser/ui/views/frame/browser_desktop_window_tree_host_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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_WIN_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_WIN_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_WIN_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_WIN_H_
7 7
8 #include <windows.h> 8 #include <windows.h>
9 #include <uxtheme.h> 9 #include <uxtheme.h>
10 10
(...skipping 11 matching lines...) Expand all
22 } 22 }
23 23
24 class BrowserDesktopWindowTreeHostWin : public BrowserDesktopWindowTreeHost, 24 class BrowserDesktopWindowTreeHostWin : public BrowserDesktopWindowTreeHost,
25 public views::DesktopWindowTreeHostWin { 25 public views::DesktopWindowTreeHostWin {
26 public: 26 public:
27 BrowserDesktopWindowTreeHostWin( 27 BrowserDesktopWindowTreeHostWin(
28 views::internal::NativeWidgetDelegate* native_widget_delegate, 28 views::internal::NativeWidgetDelegate* native_widget_delegate,
29 views::DesktopNativeWidgetAura* desktop_native_widget_aura, 29 views::DesktopNativeWidgetAura* desktop_native_widget_aura,
30 BrowserView* browser_view, 30 BrowserView* browser_view,
31 BrowserFrame* browser_frame); 31 BrowserFrame* browser_frame);
32 virtual ~BrowserDesktopWindowTreeHostWin(); 32 ~BrowserDesktopWindowTreeHostWin() override;
33 33
34 private: 34 private:
35 views::NativeMenuWin* GetSystemMenu(); 35 views::NativeMenuWin* GetSystemMenu();
36 36
37 // Overridden from BrowserDesktopWindowTreeHost: 37 // Overridden from BrowserDesktopWindowTreeHost:
38 virtual DesktopWindowTreeHost* AsDesktopWindowTreeHost() override; 38 DesktopWindowTreeHost* AsDesktopWindowTreeHost() override;
39 virtual int GetMinimizeButtonOffset() const override; 39 int GetMinimizeButtonOffset() const override;
40 virtual bool UsesNativeSystemMenu() const override; 40 bool UsesNativeSystemMenu() const override;
41 41
42 // Overridden from DesktopWindowTreeHostWin: 42 // Overridden from DesktopWindowTreeHostWin:
43 virtual int GetInitialShowState() const override; 43 int GetInitialShowState() const override;
44 virtual bool GetClientAreaInsets(gfx::Insets* insets) const override; 44 bool GetClientAreaInsets(gfx::Insets* insets) const override;
45 virtual void HandleCreate() override; 45 void HandleCreate() override;
46 virtual void HandleFrameChanged() override; 46 void HandleFrameChanged() override;
47 virtual bool PreHandleMSG(UINT message, 47 bool PreHandleMSG(UINT message,
48 WPARAM w_param, 48 WPARAM w_param,
49 LPARAM l_param, 49 LPARAM l_param,
50 LRESULT* result) override; 50 LRESULT* result) override;
51 virtual void PostHandleMSG(UINT message, 51 void PostHandleMSG(UINT message, WPARAM w_param, LPARAM l_param) override;
52 WPARAM w_param, 52 bool IsUsingCustomFrame() const override;
53 LPARAM l_param) override; 53 bool ShouldUseNativeFrame() const override;
54 virtual bool IsUsingCustomFrame() const override; 54 void FrameTypeChanged() override;
55 virtual bool ShouldUseNativeFrame() const override;
56 virtual void FrameTypeChanged() override;
57 55
58 void UpdateDWMFrame(); 56 void UpdateDWMFrame();
59 57
60 MARGINS GetDWMFrameMargins() const; 58 MARGINS GetDWMFrameMargins() const;
61 59
62 BrowserView* browser_view_; 60 BrowserView* browser_view_;
63 BrowserFrame* browser_frame_; 61 BrowserFrame* browser_frame_;
64 62
65 MinimizeButtonMetrics minimize_button_metrics_; 63 MinimizeButtonMetrics minimize_button_metrics_;
66 64
67 scoped_ptr<BrowserWindowPropertyManager> browser_window_property_manager_; 65 scoped_ptr<BrowserWindowPropertyManager> browser_window_property_manager_;
68 66
69 // The wrapped system menu itself. 67 // The wrapped system menu itself.
70 scoped_ptr<views::NativeMenuWin> system_menu_; 68 scoped_ptr<views::NativeMenuWin> system_menu_;
71 69
72 // Necessary to avoid corruption on NC paint in Aero mode. 70 // Necessary to avoid corruption on NC paint in Aero mode.
73 bool did_gdi_clear_; 71 bool did_gdi_clear_;
74 72
75 DISALLOW_COPY_AND_ASSIGN(BrowserDesktopWindowTreeHostWin); 73 DISALLOW_COPY_AND_ASSIGN(BrowserDesktopWindowTreeHostWin);
76 }; 74 };
77 75
78 76
79 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_WIN_H_ 77 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_WIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698