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

Unified Diff: athena/extensions/athena_app_delegate_base.h

Issue 641683003: C++11 override style change for athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: rebase 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « athena/env/athena_env_unittest.cc ('k') | athena/extensions/athena_app_delegate_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/extensions/athena_app_delegate_base.h
diff --git a/athena/extensions/athena_app_delegate_base.h b/athena/extensions/athena_app_delegate_base.h
index 2c8e6f5024e2cc767084c53d3597aac3b868c058..ebf806fba75140f4336ce41aab25b049228739a3 100644
--- a/athena/extensions/athena_app_delegate_base.h
+++ b/athena/extensions/athena_app_delegate_base.h
@@ -14,28 +14,27 @@ namespace athena {
class AthenaAppDelegateBase : public extensions::AppDelegate {
public:
AthenaAppDelegateBase();
- virtual ~AthenaAppDelegateBase();
+ ~AthenaAppDelegateBase() override;
private:
class NewActivityContentsDelegate;
// extensions::AppDelegate:
- virtual void ResizeWebContents(content::WebContents* web_contents,
- const gfx::Size& size) override;
- virtual content::WebContents* OpenURLFromTab(
+ void ResizeWebContents(content::WebContents* web_contents,
+ const gfx::Size& size) override;
+ content::WebContents* OpenURLFromTab(
content::BrowserContext* context,
content::WebContents* source,
const content::OpenURLParams& params) override;
- virtual void AddNewContents(content::BrowserContext* context,
- content::WebContents* new_contents,
- WindowOpenDisposition disposition,
- const gfx::Rect& initial_pos,
- bool user_gesture,
- bool* was_blocked) override;
- virtual int PreferredIconSize() override;
- virtual bool IsWebContentsVisible(
- content::WebContents* web_contents) override;
- virtual void SetTerminatingCallback(const base::Closure& callback) override;
+ void AddNewContents(content::BrowserContext* context,
+ content::WebContents* new_contents,
+ WindowOpenDisposition disposition,
+ const gfx::Rect& initial_pos,
+ bool user_gesture,
+ bool* was_blocked) override;
+ int PreferredIconSize() override;
+ bool IsWebContentsVisible(content::WebContents* web_contents) override;
+ void SetTerminatingCallback(const base::Closure& callback) override;
scoped_ptr<NewActivityContentsDelegate> new_window_contents_delegate_;
base::Closure terminating_callback_;
« no previous file with comments | « athena/env/athena_env_unittest.cc ('k') | athena/extensions/athena_app_delegate_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698