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

Side by Side Diff: chrome/browser/extensions/api/tabs/ash_panel_contents.h

Issue 624153002: replace OVERRIDE and FINAL with override and final in chrome/browser/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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_EXTENSIONS_API_TABS_ASH_PANEL_CONTENTS_H_ 5 #ifndef CHROME_BROWSER_EXTENSIONS_API_TABS_ASH_PANEL_CONTENTS_H_
6 #define CHROME_BROWSER_EXTENSIONS_API_TABS_ASH_PANEL_CONTENTS_H_ 6 #define CHROME_BROWSER_EXTENSIONS_API_TABS_ASH_PANEL_CONTENTS_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 23 matching lines...) Expand all
34 : public extensions::AppWindowContents, 34 : public extensions::AppWindowContents,
35 public content::WebContentsObserver, 35 public content::WebContentsObserver,
36 public LauncherFaviconLoader::Delegate, 36 public LauncherFaviconLoader::Delegate,
37 public extensions::ExtensionFunctionDispatcher::Delegate { 37 public extensions::ExtensionFunctionDispatcher::Delegate {
38 public: 38 public:
39 explicit AshPanelContents(extensions::AppWindow* host); 39 explicit AshPanelContents(extensions::AppWindow* host);
40 virtual ~AshPanelContents(); 40 virtual ~AshPanelContents();
41 41
42 // extensions::AppWindowContents 42 // extensions::AppWindowContents
43 virtual void Initialize(content::BrowserContext* context, 43 virtual void Initialize(content::BrowserContext* context,
44 const GURL& url) OVERRIDE; 44 const GURL& url) override;
45 virtual void LoadContents(int32 creator_process_id) OVERRIDE; 45 virtual void LoadContents(int32 creator_process_id) override;
46 virtual void NativeWindowChanged( 46 virtual void NativeWindowChanged(
47 extensions::NativeAppWindow* native_app_window) OVERRIDE; 47 extensions::NativeAppWindow* native_app_window) override;
48 virtual void NativeWindowClosed() OVERRIDE; 48 virtual void NativeWindowClosed() override;
49 virtual void DispatchWindowShownForTests() const OVERRIDE; 49 virtual void DispatchWindowShownForTests() const override;
50 virtual content::WebContents* GetWebContents() const OVERRIDE; 50 virtual content::WebContents* GetWebContents() const override;
51 51
52 // LauncherFaviconLoader::Delegate overrides: 52 // LauncherFaviconLoader::Delegate overrides:
53 virtual void FaviconUpdated() OVERRIDE; 53 virtual void FaviconUpdated() override;
54 54
55 // extensions::ExtensionFunctionDispatcher::Delegate 55 // extensions::ExtensionFunctionDispatcher::Delegate
56 virtual extensions::WindowController* GetExtensionWindowController() const 56 virtual extensions::WindowController* GetExtensionWindowController() const
57 OVERRIDE; 57 override;
58 virtual content::WebContents* GetAssociatedWebContents() const OVERRIDE; 58 virtual content::WebContents* GetAssociatedWebContents() const override;
59 59
60 LauncherFaviconLoader* launcher_favicon_loader_for_test() { 60 LauncherFaviconLoader* launcher_favicon_loader_for_test() {
61 return launcher_favicon_loader_.get(); 61 return launcher_favicon_loader_.get();
62 } 62 }
63 63
64 private: 64 private:
65 // content::WebContentsObserver 65 // content::WebContentsObserver
66 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; 66 virtual bool OnMessageReceived(const IPC::Message& message) override;
67 67
68 void OnRequest(const ExtensionHostMsg_Request_Params& params); 68 void OnRequest(const ExtensionHostMsg_Request_Params& params);
69 69
70 extensions::AppWindow* host_; 70 extensions::AppWindow* host_;
71 GURL url_; 71 GURL url_;
72 scoped_ptr<content::WebContents> web_contents_; 72 scoped_ptr<content::WebContents> web_contents_;
73 scoped_ptr<extensions::ExtensionFunctionDispatcher> 73 scoped_ptr<extensions::ExtensionFunctionDispatcher>
74 extension_function_dispatcher_; 74 extension_function_dispatcher_;
75 scoped_ptr<AshPanelWindowController> window_controller_; 75 scoped_ptr<AshPanelWindowController> window_controller_;
76 scoped_ptr<LauncherFaviconLoader> launcher_favicon_loader_; 76 scoped_ptr<LauncherFaviconLoader> launcher_favicon_loader_;
77 77
78 DISALLOW_COPY_AND_ASSIGN(AshPanelContents); 78 DISALLOW_COPY_AND_ASSIGN(AshPanelContents);
79 }; 79 };
80 80
81 #endif // CHROME_BROWSER_EXTENSIONS_API_TABS_ASH_PANEL_CONTENTS_H_ 81 #endif // CHROME_BROWSER_EXTENSIONS_API_TABS_ASH_PANEL_CONTENTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698