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

Side by Side Diff: content/public/test/browser_test_utils.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 "content/public/test/browser_test_utils.h" 5 #include "content/public/test/browser_test_utils.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/json/json_reader.h" 9 #include "base/json/json_reader.h"
10 #include "base/process/kill.h" 10 #include "base/process/kill.h"
(...skipping 763 matching lines...) Expand 10 before | Expand all | Expand 10 after
774 774
775 TitleWatcher::~TitleWatcher() { 775 TitleWatcher::~TitleWatcher() {
776 } 776 }
777 777
778 const base::string16& TitleWatcher::WaitAndGetTitle() { 778 const base::string16& TitleWatcher::WaitAndGetTitle() {
779 TestTitle(); 779 TestTitle();
780 message_loop_runner_->Run(); 780 message_loop_runner_->Run();
781 return observed_title_; 781 return observed_title_;
782 } 782 }
783 783
784 void TitleWatcher::DidStopLoading(RenderViewHost* render_view_host) { 784 void TitleWatcher::DidStopLoading() {
785 // When navigating through the history, the restored NavigationEntry's title 785 // When navigating through the history, the restored NavigationEntry's title
786 // will be used. If the entry ends up having the same title after we return 786 // will be used. If the entry ends up having the same title after we return
787 // to it, as will usually be the case, then WebContentsObserver::TitleSet 787 // to it, as will usually be the case, then WebContentsObserver::TitleSet
788 // will then be suppressed, since the NavigationEntry's title hasn't changed. 788 // will then be suppressed, since the NavigationEntry's title hasn't changed.
789 TestTitle(); 789 TestTitle();
790 } 790 }
791 791
792 void TitleWatcher::TitleWasSet(NavigationEntry* entry, bool explicit_set) { 792 void TitleWatcher::TitleWasSet(NavigationEntry* entry, bool explicit_set) {
793 TestTitle(); 793 TestTitle();
794 } 794 }
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
954 954
955 bool WebContentsAddedObserver::RenderViewCreatedCalled() { 955 bool WebContentsAddedObserver::RenderViewCreatedCalled() {
956 if (child_observer_) { 956 if (child_observer_) {
957 return child_observer_->render_view_created_called_ && 957 return child_observer_->render_view_created_called_ &&
958 child_observer_->main_frame_created_called_; 958 child_observer_->main_frame_created_called_;
959 } 959 }
960 return false; 960 return false;
961 } 961 }
962 962
963 } // namespace content 963 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698