Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 "chrome/test/base/testing_browser_process.h" | 5 #include "chrome/test/base/testing_browser_process.h" |
| 6 | 6 |
| 7 #include "base/strings/string_util.h" | 7 #include "base/strings/string_util.h" |
| 8 #include "base/time/default_clock.h" | 8 #include "base/time/default_clock.h" |
| 9 #include "base/time/default_tick_clock.h" | 9 #include "base/time/default_tick_clock.h" |
| 10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 207 BrowserProcessPlatformPart* TestingBrowserProcess::platform_part() { | 207 BrowserProcessPlatformPart* TestingBrowserProcess::platform_part() { |
| 208 return platform_part_.get(); | 208 return platform_part_.get(); |
| 209 } | 209 } |
| 210 | 210 |
| 211 extensions::EventRouterForwarder* | 211 extensions::EventRouterForwarder* |
| 212 TestingBrowserProcess::extension_event_router_forwarder() { | 212 TestingBrowserProcess::extension_event_router_forwarder() { |
| 213 return nullptr; | 213 return nullptr; |
| 214 } | 214 } |
| 215 | 215 |
| 216 NotificationUIManager* TestingBrowserProcess::notification_ui_manager() { | 216 NotificationUIManager* TestingBrowserProcess::notification_ui_manager() { |
| 217 #if defined(OS_ANDROID) | |
|
Peter Beverloo
2016/04/18 14:57:10
Why not modify the #ifdef on line 221? Displaying
Miguel Garcia
2016/04/19 14:24:58
SG
| |
| 218 return nullptr; | |
| 219 #endif | |
| 220 | |
| 217 #if defined(ENABLE_NOTIFICATIONS) | 221 #if defined(ENABLE_NOTIFICATIONS) |
| 218 if (!notification_ui_manager_.get()) | 222 if (!notification_ui_manager_.get()) |
| 219 notification_ui_manager_.reset( | 223 notification_ui_manager_.reset( |
| 220 NotificationUIManager::Create(local_state())); | 224 NotificationUIManager::Create(local_state())); |
| 221 return notification_ui_manager_.get(); | 225 return notification_ui_manager_.get(); |
| 222 #else | 226 #else |
| 223 NOTIMPLEMENTED(); | 227 NOTIMPLEMENTED(); |
| 224 return nullptr; | 228 return nullptr; |
| 225 #endif | 229 #endif |
| 226 } | 230 } |
| 227 | 231 |
| 232 NotificationBridge* TestingBrowserProcess::notification_bridge() { | |
| 233 return nullptr; | |
| 234 } | |
| 235 | |
| 228 message_center::MessageCenter* TestingBrowserProcess::message_center() { | 236 message_center::MessageCenter* TestingBrowserProcess::message_center() { |
| 229 return message_center::MessageCenter::Get(); | 237 return message_center::MessageCenter::Get(); |
| 230 } | 238 } |
| 231 | 239 |
| 232 IntranetRedirectDetector* TestingBrowserProcess::intranet_redirect_detector() { | 240 IntranetRedirectDetector* TestingBrowserProcess::intranet_redirect_detector() { |
| 233 return nullptr; | 241 return nullptr; |
| 234 } | 242 } |
| 235 | 243 |
| 236 void TestingBrowserProcess::CreateDevToolsHttpProtocolHandler( | 244 void TestingBrowserProcess::CreateDevToolsHttpProtocolHandler( |
| 237 const std::string& ip, | 245 const std::string& ip, |
| (...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 419 | 427 |
| 420 /////////////////////////////////////////////////////////////////////////////// | 428 /////////////////////////////////////////////////////////////////////////////// |
| 421 | 429 |
| 422 TestingBrowserProcessInitializer::TestingBrowserProcessInitializer() { | 430 TestingBrowserProcessInitializer::TestingBrowserProcessInitializer() { |
| 423 TestingBrowserProcess::CreateInstance(); | 431 TestingBrowserProcess::CreateInstance(); |
| 424 } | 432 } |
| 425 | 433 |
| 426 TestingBrowserProcessInitializer::~TestingBrowserProcessInitializer() { | 434 TestingBrowserProcessInitializer::~TestingBrowserProcessInitializer() { |
| 427 TestingBrowserProcess::DeleteInstance(); | 435 TestingBrowserProcess::DeleteInstance(); |
| 428 } | 436 } |
| OLD | NEW |