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

Side by Side Diff: extensions/shell/browser/shell_native_app_window.h

Issue 622343002: replace OVERRIDE and FINAL with override and final in extensions/ (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 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 EXTENSIONS_SHELL_BROWSER_SHELL_NATIVE_APP_WINDOW_H_ 5 #ifndef EXTENSIONS_SHELL_BROWSER_SHELL_NATIVE_APP_WINDOW_H_
6 #define EXTENSIONS_SHELL_BROWSER_SHELL_NATIVE_APP_WINDOW_H_ 6 #define EXTENSIONS_SHELL_BROWSER_SHELL_NATIVE_APP_WINDOW_H_
7 7
8 #include "extensions/browser/app_window/app_window.h" 8 #include "extensions/browser/app_window/app_window.h"
9 #include "extensions/browser/app_window/native_app_window.h" 9 #include "extensions/browser/app_window/native_app_window.h"
10 10
11 namespace extensions { 11 namespace extensions {
12 12
13 // app_shell's NativeAppWindow implementation. 13 // app_shell's NativeAppWindow implementation.
14 class ShellNativeAppWindow : public NativeAppWindow { 14 class ShellNativeAppWindow : public NativeAppWindow {
15 public: 15 public:
16 ShellNativeAppWindow(AppWindow* app_window, 16 ShellNativeAppWindow(AppWindow* app_window,
17 const AppWindow::CreateParams& params); 17 const AppWindow::CreateParams& params);
18 virtual ~ShellNativeAppWindow(); 18 virtual ~ShellNativeAppWindow();
19 19
20 // ui::BaseView overrides: 20 // ui::BaseView overrides:
21 virtual bool IsActive() const OVERRIDE; 21 virtual bool IsActive() const override;
22 virtual bool IsMaximized() const OVERRIDE; 22 virtual bool IsMaximized() const override;
23 virtual bool IsMinimized() const OVERRIDE; 23 virtual bool IsMinimized() const override;
24 virtual bool IsFullscreen() const OVERRIDE; 24 virtual bool IsFullscreen() const override;
25 virtual gfx::NativeWindow GetNativeWindow() OVERRIDE; 25 virtual gfx::NativeWindow GetNativeWindow() override;
26 virtual gfx::Rect GetRestoredBounds() const OVERRIDE; 26 virtual gfx::Rect GetRestoredBounds() const override;
27 virtual ui::WindowShowState GetRestoredState() const OVERRIDE; 27 virtual ui::WindowShowState GetRestoredState() const override;
28 virtual gfx::Rect GetBounds() const OVERRIDE; 28 virtual gfx::Rect GetBounds() const override;
29 virtual void Show() OVERRIDE; 29 virtual void Show() override;
30 virtual void Hide() OVERRIDE; 30 virtual void Hide() override;
31 virtual void ShowInactive() OVERRIDE; 31 virtual void ShowInactive() override;
32 virtual void Close() OVERRIDE; 32 virtual void Close() override;
33 virtual void Activate() OVERRIDE; 33 virtual void Activate() override;
34 virtual void Deactivate() OVERRIDE; 34 virtual void Deactivate() override;
35 virtual void Maximize() OVERRIDE; 35 virtual void Maximize() override;
36 virtual void Minimize() OVERRIDE; 36 virtual void Minimize() override;
37 virtual void Restore() OVERRIDE; 37 virtual void Restore() override;
38 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; 38 virtual void SetBounds(const gfx::Rect& bounds) override;
39 virtual void FlashFrame(bool flash) OVERRIDE; 39 virtual void FlashFrame(bool flash) override;
40 virtual bool IsAlwaysOnTop() const OVERRIDE; 40 virtual bool IsAlwaysOnTop() const override;
41 virtual void SetAlwaysOnTop(bool always_on_top) OVERRIDE; 41 virtual void SetAlwaysOnTop(bool always_on_top) override;
42 42
43 // web_modal::ModalDialogHost overrides: 43 // web_modal::ModalDialogHost overrides:
44 virtual gfx::NativeView GetHostView() const OVERRIDE; 44 virtual gfx::NativeView GetHostView() const override;
45 virtual gfx::Point GetDialogPosition(const gfx::Size& size) OVERRIDE; 45 virtual gfx::Point GetDialogPosition(const gfx::Size& size) override;
46 virtual void AddObserver( 46 virtual void AddObserver(
47 web_modal::ModalDialogHostObserver* observer) OVERRIDE; 47 web_modal::ModalDialogHostObserver* observer) override;
48 virtual void RemoveObserver( 48 virtual void RemoveObserver(
49 web_modal::ModalDialogHostObserver* observer) OVERRIDE; 49 web_modal::ModalDialogHostObserver* observer) override;
50 50
51 // web_modal::WebContentsModalDialogHost overrides: 51 // web_modal::WebContentsModalDialogHost overrides:
52 virtual gfx::Size GetMaximumDialogSize() OVERRIDE; 52 virtual gfx::Size GetMaximumDialogSize() override;
53 53
54 // NativeAppWindow overrides: 54 // NativeAppWindow overrides:
55 virtual void SetFullscreen(int fullscreen_types) OVERRIDE; 55 virtual void SetFullscreen(int fullscreen_types) override;
56 virtual bool IsFullscreenOrPending() const OVERRIDE; 56 virtual bool IsFullscreenOrPending() const override;
57 virtual void UpdateWindowIcon() OVERRIDE; 57 virtual void UpdateWindowIcon() override;
58 virtual void UpdateWindowTitle() OVERRIDE; 58 virtual void UpdateWindowTitle() override;
59 virtual void UpdateBadgeIcon() OVERRIDE; 59 virtual void UpdateBadgeIcon() override;
60 virtual void UpdateDraggableRegions( 60 virtual void UpdateDraggableRegions(
61 const std::vector<DraggableRegion>& regions) OVERRIDE; 61 const std::vector<DraggableRegion>& regions) override;
62 virtual SkRegion* GetDraggableRegion() OVERRIDE; 62 virtual SkRegion* GetDraggableRegion() override;
63 virtual void UpdateShape(scoped_ptr<SkRegion> region) OVERRIDE; 63 virtual void UpdateShape(scoped_ptr<SkRegion> region) override;
64 virtual void HandleKeyboardEvent( 64 virtual void HandleKeyboardEvent(
65 const content::NativeWebKeyboardEvent& event) OVERRIDE; 65 const content::NativeWebKeyboardEvent& event) override;
66 virtual bool IsFrameless() const OVERRIDE; 66 virtual bool IsFrameless() const override;
67 virtual bool HasFrameColor() const OVERRIDE; 67 virtual bool HasFrameColor() const override;
68 virtual SkColor ActiveFrameColor() const OVERRIDE; 68 virtual SkColor ActiveFrameColor() const override;
69 virtual SkColor InactiveFrameColor() const OVERRIDE; 69 virtual SkColor InactiveFrameColor() const override;
70 virtual gfx::Insets GetFrameInsets() const OVERRIDE; 70 virtual gfx::Insets GetFrameInsets() const override;
71 virtual void ShowWithApp() OVERRIDE; 71 virtual void ShowWithApp() override;
72 virtual void HideWithApp() OVERRIDE; 72 virtual void HideWithApp() override;
73 virtual void UpdateShelfMenu() OVERRIDE; 73 virtual void UpdateShelfMenu() override;
74 virtual gfx::Size GetContentMinimumSize() const OVERRIDE; 74 virtual gfx::Size GetContentMinimumSize() const override;
75 virtual gfx::Size GetContentMaximumSize() const OVERRIDE; 75 virtual gfx::Size GetContentMaximumSize() const override;
76 virtual void SetContentSizeConstraints(const gfx::Size& min_size, 76 virtual void SetContentSizeConstraints(const gfx::Size& min_size,
77 const gfx::Size& max_size) OVERRIDE; 77 const gfx::Size& max_size) override;
78 virtual void SetVisibleOnAllWorkspaces(bool always_visible) OVERRIDE; 78 virtual void SetVisibleOnAllWorkspaces(bool always_visible) override;
79 virtual bool CanHaveAlphaEnabled() const OVERRIDE; 79 virtual bool CanHaveAlphaEnabled() const override;
80 80
81 private: 81 private:
82 aura::Window* GetWindow() const; 82 aura::Window* GetWindow() const;
83 83
84 AppWindow* app_window_; 84 AppWindow* app_window_;
85 85
86 DISALLOW_COPY_AND_ASSIGN(ShellNativeAppWindow); 86 DISALLOW_COPY_AND_ASSIGN(ShellNativeAppWindow);
87 }; 87 };
88 88
89 } // namespace extensions 89 } // namespace extensions
90 90
91 #endif // EXTENSIONS_SHELL_BROWSER_SHELL_NATIVE_APP_WINDOW_H_ 91 #endif // EXTENSIONS_SHELL_BROWSER_SHELL_NATIVE_APP_WINDOW_H_
OLDNEW
« no previous file with comments | « extensions/shell/browser/shell_nacl_browser_delegate.h ('k') | extensions/shell/browser/shell_network_controller_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698