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

Side by Side Diff: ash/screensaver/screensaver_view.h

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (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
« no previous file with comments | « ash/rotator/screen_rotation.h ('k') | ash/screensaver/screensaver_view_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ASH_SCREENSAVER_SCREENSAVER_VIEW_H_ 5 #ifndef ASH_SCREENSAVER_SCREENSAVER_VIEW_H_
6 #define ASH_SCREENSAVER_SCREENSAVER_VIEW_H_ 6 #define ASH_SCREENSAVER_SCREENSAVER_VIEW_H_
7 7
8 #include "ash/content_support/ash_with_content_export.h" 8 #include "ash/content_support/ash_with_content_export.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "content/public/browser/web_contents_observer.h" 10 #include "content/public/browser/web_contents_observer.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 43
44 static bool IsScreensaverShown(); 44 static bool IsScreensaverShown();
45 45
46 private: 46 private:
47 friend class test::ScreensaverViewTest; 47 friend class test::ScreensaverViewTest;
48 48
49 explicit ScreensaverView(const GURL& url); 49 explicit ScreensaverView(const GURL& url);
50 virtual ~ScreensaverView(); 50 virtual ~ScreensaverView();
51 51
52 // views::WidgetDelegate overrides. 52 // views::WidgetDelegate overrides.
53 virtual views::View* GetContentsView() OVERRIDE; 53 virtual views::View* GetContentsView() override;
54 54
55 // content::WebContentsObserver overrides. 55 // content::WebContentsObserver overrides.
56 virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE; 56 virtual void RenderProcessGone(base::TerminationStatus status) override;
57 57
58 void Show(); 58 void Show();
59 void Close(); 59 void Close();
60 60
61 // Creates and adds web contents to our view. 61 // Creates and adds web contents to our view.
62 void AddChildWebContents(); 62 void AddChildWebContents();
63 // Load the screensaver in the WebView's webcontent. If the webcontents 63 // Load the screensaver in the WebView's webcontent. If the webcontents
64 // don't exist, they'll be created by WebView. 64 // don't exist, they'll be created by WebView.
65 void LoadScreensaver(); 65 void LoadScreensaver();
66 // Creates and shows a frameless full screen window containing our view. 66 // Creates and shows a frameless full screen window containing our view.
(...skipping 15 matching lines...) Expand all
82 82
83 // Window that holds the screensaver webview. 83 // Window that holds the screensaver webview.
84 views::Widget* container_window_; 84 views::Widget* container_window_;
85 85
86 DISALLOW_COPY_AND_ASSIGN(ScreensaverView); 86 DISALLOW_COPY_AND_ASSIGN(ScreensaverView);
87 }; 87 };
88 88
89 } // namespace ash 89 } // namespace ash
90 90
91 #endif // ASH_SCREENSAVER_SCREENSAVER_VIEW_H_ 91 #endif // ASH_SCREENSAVER_SCREENSAVER_VIEW_H_
OLDNEW
« no previous file with comments | « ash/rotator/screen_rotation.h ('k') | ash/screensaver/screensaver_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698