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

Side by Side Diff: content/public/test/content_browser_test_utils.cc

Issue 629203002: Replace OVERRIDE and FINAL with override and final in content/public/[a-s]* (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 #include "content/public/test/content_browser_test_utils.h" 5 #include "content/public/test/content_browser_test_utils.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 } 103 }
104 104
105 class RenderViewCreatedObserver : public WebContentsObserver { 105 class RenderViewCreatedObserver : public WebContentsObserver {
106 public: 106 public:
107 explicit RenderViewCreatedObserver(WebContents* web_contents) 107 explicit RenderViewCreatedObserver(WebContents* web_contents)
108 : WebContentsObserver(web_contents), 108 : WebContentsObserver(web_contents),
109 render_view_created_called_(false) { 109 render_view_created_called_(false) {
110 } 110 }
111 111
112 // WebContentsObserver: 112 // WebContentsObserver:
113 virtual void RenderViewCreated(RenderViewHost* rvh) OVERRIDE { 113 virtual void RenderViewCreated(RenderViewHost* rvh) override {
114 render_view_created_called_ = true; 114 render_view_created_called_ = true;
115 } 115 }
116 116
117 bool render_view_created_called_; 117 bool render_view_created_called_;
118 }; 118 };
119 119
120 WebContentsAddedObserver::WebContentsAddedObserver() 120 WebContentsAddedObserver::WebContentsAddedObserver()
121 : web_contents_created_callback_( 121 : web_contents_created_callback_(
122 base::Bind( 122 base::Bind(
123 &WebContentsAddedObserver::WebContentsCreated, 123 &WebContentsAddedObserver::WebContentsCreated,
(...skipping 25 matching lines...) Expand all
149 } 149 }
150 150
151 bool WebContentsAddedObserver::RenderViewCreatedCalled() { 151 bool WebContentsAddedObserver::RenderViewCreatedCalled() {
152 if (child_observer_) 152 if (child_observer_)
153 return child_observer_->render_view_created_called_; 153 return child_observer_->render_view_created_called_;
154 154
155 return false; 155 return false;
156 } 156 }
157 157
158 } // namespace content 158 } // namespace content
OLDNEW
« no previous file with comments | « content/public/test/content_browser_test.h ('k') | content/public/test/content_test_suite_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698