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

Side by Side Diff: chrome/browser/ui/views/frame/desktop_browser_frame_aura.h

Issue 628773002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[t-v]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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_DESKTOP_BROWSER_FRAME_AURA_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "chrome/browser/ui/views/frame/native_browser_frame.h" 10 #include "chrome/browser/ui/views/frame/native_browser_frame.h"
(...skipping 19 matching lines...) Expand all
30 public: 30 public:
31 DesktopBrowserFrameAura(BrowserFrame* browser_frame, 31 DesktopBrowserFrameAura(BrowserFrame* browser_frame,
32 BrowserView* browser_view); 32 BrowserView* browser_view);
33 33
34 BrowserView* browser_view() const { return browser_view_; } 34 BrowserView* browser_view() const { return browser_view_; }
35 35
36 protected: 36 protected:
37 virtual ~DesktopBrowserFrameAura(); 37 virtual ~DesktopBrowserFrameAura();
38 38
39 // Overridden from views::DesktopNativeWidgetAura: 39 // Overridden from views::DesktopNativeWidgetAura:
40 virtual void OnHostClosed() OVERRIDE; 40 virtual void OnHostClosed() override;
41 virtual void InitNativeWidget( 41 virtual void InitNativeWidget(
42 const views::Widget::InitParams& params) OVERRIDE; 42 const views::Widget::InitParams& params) override;
43 43
44 // Overridden from NativeBrowserFrame: 44 // Overridden from NativeBrowserFrame:
45 virtual views::NativeWidget* AsNativeWidget() OVERRIDE; 45 virtual views::NativeWidget* AsNativeWidget() override;
46 virtual const views::NativeWidget* AsNativeWidget() const OVERRIDE; 46 virtual const views::NativeWidget* AsNativeWidget() const override;
47 virtual bool UsesNativeSystemMenu() const OVERRIDE; 47 virtual bool UsesNativeSystemMenu() const override;
48 virtual int GetMinimizeButtonOffset() const OVERRIDE; 48 virtual int GetMinimizeButtonOffset() const override;
49 virtual bool ShouldSaveWindowPlacement() const OVERRIDE; 49 virtual bool ShouldSaveWindowPlacement() const override;
50 virtual void GetWindowPlacement( 50 virtual void GetWindowPlacement(
51 gfx::Rect* bounds, 51 gfx::Rect* bounds,
52 ui::WindowShowState* show_state) const OVERRIDE; 52 ui::WindowShowState* show_state) const override;
53 53
54 private: 54 private:
55 // The BrowserView is our ClientView. This is a pointer to it. 55 // The BrowserView is our ClientView. This is a pointer to it.
56 BrowserView* browser_view_; 56 BrowserView* browser_view_;
57 BrowserFrame* browser_frame_; 57 BrowserFrame* browser_frame_;
58 58
59 // Owned by the RootWindow. 59 // Owned by the RootWindow.
60 BrowserDesktopWindowTreeHost* browser_desktop_window_tree_host_; 60 BrowserDesktopWindowTreeHost* browser_desktop_window_tree_host_;
61 61
62 scoped_ptr<wm::VisibilityController> visibility_controller_; 62 scoped_ptr<wm::VisibilityController> visibility_controller_;
63 63
64 DISALLOW_COPY_AND_ASSIGN(DesktopBrowserFrameAura); 64 DISALLOW_COPY_AND_ASSIGN(DesktopBrowserFrameAura);
65 }; 65 };
66 66
67 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_ 67 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/contents_web_view.h ('k') | chrome/browser/ui/views/frame/glass_browser_frame_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698