| Index: chrome/browser/browser_main.cc
|
| ===================================================================
|
| --- chrome/browser/browser_main.cc (revision 85733)
|
| +++ chrome/browser/browser_main.cc (working copy)
|
| @@ -24,7 +24,6 @@
|
| #include "base/string_split.h"
|
| #include "base/string_util.h"
|
| #include "base/sys_string_conversions.h"
|
| -#include "base/system_monitor/system_monitor.h"
|
| #include "base/threading/platform_thread.h"
|
| #include "base/threading/thread_restrictions.h"
|
| #include "base/time.h"
|
| @@ -110,6 +109,7 @@
|
| #include "net/url_request/url_request_throttler_manager.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| +#include "ui/base/system_monitor/system_monitor.h"
|
| #include "ui/gfx/gl/gl_implementation.h"
|
| #include "ui/gfx/gl/gl_switches.h"
|
|
|
| @@ -527,7 +527,7 @@
|
| main_message_loop_.reset(new MessageLoop(MessageLoop::TYPE_UI));
|
|
|
| // TODO(viettrungluu): should these really go before setting the thread name?
|
| - system_monitor_.reset(new base::SystemMonitor);
|
| + system_monitor_.reset(new ui::SystemMonitor);
|
| hi_res_timer_manager_.reset(new HighResolutionTimerManager);
|
| network_change_notifier_.reset(net::NetworkChangeNotifier::Create());
|
|
|
|
|