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

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

Issue 1407353012: Refactor FaviconDriver::OnFaviconAvailable() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@initial_simplify
Patch Set: Created 5 years, 1 month 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 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 void Wait() { 153 void Wait() {
154 if (seen_) 154 if (seen_)
155 return; 155 return;
156 156
157 running_ = true; 157 running_ = true;
158 message_loop_runner_ = new content::MessageLoopRunner; 158 message_loop_runner_ = new content::MessageLoopRunner;
159 message_loop_runner_->Run(); 159 message_loop_runner_->Run();
160 } 160 }
161 161
162 private: 162 private:
163 void OnFaviconAvailable(const gfx::Image& image) override {}
164 void OnFaviconUpdated(favicon::FaviconDriver* favicon_driver, 163 void OnFaviconUpdated(favicon::FaviconDriver* favicon_driver,
165 bool icon_url_changed) override { 164 NotificationIconType notification_icon_type,
165 const GURL& icon_url,
166 bool icon_url_changed,
167 const gfx::Image& image) override {
166 seen_ = true; 168 seen_ = true;
167 if (!running_) 169 if (!running_)
168 return; 170 return;
169 171
170 message_loop_runner_->Quit(); 172 message_loop_runner_->Quit();
171 running_ = false; 173 running_ = false;
172 } 174 }
173 175
174 bool seen_; 176 bool seen_;
175 bool running_; 177 bool running_;
(...skipping 3984 matching lines...) Expand 10 before | Expand all | Expand 10 after
4160 4162
4161 NavigateToDestURL(); 4163 NavigateToDestURL();
4162 EXPECT_EQ(1U, task_manager.tasks().size()); 4164 EXPECT_EQ(1U, task_manager.tasks().size());
4163 } 4165 }
4164 4166
4165 } // namespace 4167 } // namespace
4166 4168
4167 #endif // defined(ENABLE_TASK_MANAGER) 4169 #endif // defined(ENABLE_TASK_MANAGER)
4168 4170
4169 } // namespace prerender 4171 } // namespace prerender
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698