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

Side by Side Diff: chrome/browser/ui/views/apps/app_window_desktop_native_widget_aura_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_APP_WINDOW_DESKTOP_NATIVE_WIDGET_AURA_WIN_H _ 5 #ifndef CHROME_BROWSER_UI_VIEWS_APPS_APP_WINDOW_DESKTOP_NATIVE_WIDGET_AURA_WIN_H _
6 #define CHROME_BROWSER_UI_VIEWS_APPS_APP_WINDOW_DESKTOP_NATIVE_WIDGET_AURA_WIN_H _ 6 #define CHROME_BROWSER_UI_VIEWS_APPS_APP_WINDOW_DESKTOP_NATIVE_WIDGET_AURA_WIN_H _
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" 9 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
10 10
(...skipping 11 matching lines...) Expand all
22 22
23 // AppWindowDesktopNativeWidgetAura is a DesktopNativeWidgetAura subclass that 23 // AppWindowDesktopNativeWidgetAura is a DesktopNativeWidgetAura subclass that
24 // handles creating the right type of tree hosts for app windows on Windows. 24 // handles creating the right type of tree hosts for app windows on Windows.
25 class AppWindowDesktopNativeWidgetAuraWin 25 class AppWindowDesktopNativeWidgetAuraWin
26 : public views::DesktopNativeWidgetAura { 26 : public views::DesktopNativeWidgetAura {
27 public: 27 public:
28 explicit AppWindowDesktopNativeWidgetAuraWin( 28 explicit AppWindowDesktopNativeWidgetAuraWin(
29 ChromeNativeAppWindowViewsWin* app_window); 29 ChromeNativeAppWindowViewsWin* app_window);
30 30
31 protected: 31 protected:
32 virtual ~AppWindowDesktopNativeWidgetAuraWin(); 32 ~AppWindowDesktopNativeWidgetAuraWin() override;
33 33
34 // Overridden from views::DesktopNativeWidgetAura: 34 // Overridden from views::DesktopNativeWidgetAura:
35 virtual void InitNativeWidget( 35 void InitNativeWidget(const views::Widget::InitParams& params) override;
36 const views::Widget::InitParams& params) override;
37 void Maximize() override; 36 void Maximize() override;
38 void Minimize() override; 37 void Minimize() override;
39 38
40 private: 39 private:
41 // Ownership managed by the views system. 40 // Ownership managed by the views system.
42 ChromeNativeAppWindowViewsWin* app_window_; 41 ChromeNativeAppWindowViewsWin* app_window_;
43 42
44 // Owned by superclass DesktopNativeWidgetAura. 43 // Owned by superclass DesktopNativeWidgetAura.
45 views::DesktopWindowTreeHost* tree_host_; 44 views::DesktopWindowTreeHost* tree_host_;
46 45
47 DISALLOW_COPY_AND_ASSIGN(AppWindowDesktopNativeWidgetAuraWin); 46 DISALLOW_COPY_AND_ASSIGN(AppWindowDesktopNativeWidgetAuraWin);
48 }; 47 };
49 48
50 #endif // CHROME_BROWSER_UI_VIEWS_APPS_APP_WINDOW_DESKTOP_NATIVE_WIDGET_AURA_WI N_H_ 49 #endif // CHROME_BROWSER_UI_VIEWS_APPS_APP_WINDOW_DESKTOP_NATIVE_WIDGET_AURA_WI N_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698