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

Side by Side Diff: chrome/test/base/testing_browser_process.cc

Issue 8102019: redesign and reimplement proxy config service and tracker, revise proxy ui on cros (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "chrome/test/base/testing_browser_process.h" 5 #include "chrome/test/base/testing_browser_process.h"
6 6
7 #include "base/string_util.h" 7 #include "base/string_util.h"
8 #include "chrome/browser/google/google_url_tracker.h" 8 #include "chrome/browser/google/google_url_tracker.h"
9 #include "chrome/browser/notifications/notification_ui_manager.h" 9 #include "chrome/browser/notifications/notification_ui_manager.h"
10 #include "chrome/browser/policy/browser_policy_connector.h" 10 #include "chrome/browser/policy/browser_policy_connector.h"
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 safe_browsing::ClientSideDetectionService* 124 safe_browsing::ClientSideDetectionService*
125 TestingBrowserProcess::safe_browsing_detection_service() { 125 TestingBrowserProcess::safe_browsing_detection_service() {
126 return NULL; 126 return NULL;
127 } 127 }
128 128
129 net::URLRequestContextGetter* TestingBrowserProcess::system_request_context() { 129 net::URLRequestContextGetter* TestingBrowserProcess::system_request_context() {
130 return NULL; 130 return NULL;
131 } 131 }
132 132
133 #if defined(OS_CHROMEOS) 133 #if defined(OS_CHROMEOS)
134 chromeos::ProxyConfigServiceImpl*
135 TestingBrowserProcess::chromeos_proxy_config_service_impl() {
136 return NULL;
137 }
138
139 browser::OomPriorityManager* TestingBrowserProcess::oom_priority_manager() { 134 browser::OomPriorityManager* TestingBrowserProcess::oom_priority_manager() {
140 return NULL; 135 return NULL;
141 } 136 }
142 #endif // defined(OS_CHROMEOS) 137 #endif // defined(OS_CHROMEOS)
143 138
144 ui::Clipboard* TestingBrowserProcess::clipboard() { 139 ui::Clipboard* TestingBrowserProcess::clipboard() {
145 if (!clipboard_.get()) { 140 if (!clipboard_.get()) {
146 // Note that we need a MessageLoop for the next call to work. 141 // Note that we need a MessageLoop for the next call to work.
147 clipboard_.reset(new ui::Clipboard); 142 clipboard_.reset(new ui::Clipboard);
148 } 143 }
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 google_url_tracker_.reset(google_url_tracker); 267 google_url_tracker_.reset(google_url_tracker);
273 } 268 }
274 269
275 void TestingBrowserProcess::SetIOThread(IOThread* io_thread) { 270 void TestingBrowserProcess::SetIOThread(IOThread* io_thread) {
276 io_thread_ = io_thread; 271 io_thread_ = io_thread;
277 } 272 }
278 273
279 void TestingBrowserProcess::SetDevToolsManager(DevToolsManager* manager) { 274 void TestingBrowserProcess::SetDevToolsManager(DevToolsManager* manager) {
280 devtools_manager_.reset(manager); 275 devtools_manager_.reset(manager);
281 } 276 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698