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

Side by Side Diff: chrome/browser/prerender/prerender_browsertest.cc

Issue 1008913002: Remove RenderViewHost parameter from WebContentsObserver::Did{Start|Stop}Loading. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 9 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 <deque> 5 #include <deque>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 304
305 void set_did_start_loading() { 305 void set_did_start_loading() {
306 did_start_loading_ = true; 306 did_start_loading_ = true;
307 } 307 }
308 308
309 void Wait() { 309 void Wait() {
310 loop_.Run(); 310 loop_.Run();
311 } 311 }
312 312
313 // WebContentsObserver implementation: 313 // WebContentsObserver implementation:
314 void DidStartLoading(RenderViewHost* render_view_host) override { 314 void DidStartLoading() override { did_start_loading_ = true; }
315 did_start_loading_ = true; 315 void DidStopLoading() override {
316 }
317 void DidStopLoading(RenderViewHost* render_view_host) override {
318 if (!did_start_loading_) 316 if (!did_start_loading_)
319 return; 317 return;
320 number_of_loads_--; 318 number_of_loads_--;
321 if (number_of_loads_ == 0) 319 if (number_of_loads_ == 0)
322 loop_.Quit(); 320 loop_.Quit();
323 } 321 }
324 322
325 // TabStripModelObserver implementation: 323 // TabStripModelObserver implementation:
326 void TabReplacedAt(TabStripModel* tab_strip_model, 324 void TabReplacedAt(TabStripModel* tab_strip_model,
327 WebContents* old_contents, 325 WebContents* old_contents,
(...skipping 3846 matching lines...) Expand 10 before | Expand all | Expand 10 after
4174 TestShouldDisableLocalPredictorPreferenceNetworkMatrix( 4172 TestShouldDisableLocalPredictorPreferenceNetworkMatrix(
4175 true /*preference_wifi_network_wifi*/, 4173 true /*preference_wifi_network_wifi*/,
4176 true /*preference_wifi_network_4g*/, 4174 true /*preference_wifi_network_4g*/,
4177 true /*preference_always_network_wifi*/, 4175 true /*preference_always_network_wifi*/,
4178 false /*preference_always_network_4g*/, 4176 false /*preference_always_network_4g*/,
4179 true /*preference_never_network_wifi*/, 4177 true /*preference_never_network_wifi*/,
4180 true /*preference_never_network_4g*/); 4178 true /*preference_never_network_4g*/);
4181 } 4179 }
4182 4180
4183 } // namespace prerender 4181 } // namespace prerender
OLDNEW
« no previous file with comments | « chrome/browser/policy/policy_browsertest.cc ('k') | chrome/browser/prerender/prerender_contents.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698