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

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 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 void Wait() { 160 void Wait() {
161 if (seen_) 161 if (seen_)
162 return; 162 return;
163 163
164 running_ = true; 164 running_ = true;
165 message_loop_runner_ = new content::MessageLoopRunner; 165 message_loop_runner_ = new content::MessageLoopRunner;
166 message_loop_runner_->Run(); 166 message_loop_runner_->Run();
167 } 167 }
168 168
169 private: 169 private:
170 void OnFaviconAvailable(const gfx::Image& image) override {}
171 void OnFaviconUpdated(favicon::FaviconDriver* favicon_driver, 170 void OnFaviconUpdated(favicon::FaviconDriver* favicon_driver,
172 bool icon_url_changed) override { 171 NotificationIconType notification_icon_type,
172 const GURL& icon_url,
173 bool icon_url_changed,
174 const gfx::Image& image) override {
173 seen_ = true; 175 seen_ = true;
174 if (!running_) 176 if (!running_)
175 return; 177 return;
176 178
177 message_loop_runner_->Quit(); 179 message_loop_runner_->Quit();
178 running_ = false; 180 running_ = false;
179 } 181 }
180 182
181 bool seen_; 183 bool seen_;
182 bool running_; 184 bool running_;
(...skipping 3857 matching lines...) Expand 10 before | Expand all | Expand 10 after
4040 4042
4041 NavigateToDestURL(); 4043 NavigateToDestURL();
4042 EXPECT_EQ(1U, task_manager.tasks().size()); 4044 EXPECT_EQ(1U, task_manager.tasks().size());
4043 } 4045 }
4044 4046
4045 } // namespace 4047 } // namespace
4046 4048
4047 #endif // defined(ENABLE_TASK_MANAGER) 4049 #endif // defined(ENABLE_TASK_MANAGER)
4048 4050
4049 } // namespace prerender 4051 } // namespace prerender
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698