diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 21:31:07 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 21:31:07 +0000 |
| commit | 3f03f1f2dfa411916fc5db22e32a05c6360d6bcc (patch) | |
| tree | 51981422445df005dd7f8ae8783459fe18513d95 /chrome/browser/browser_main.cc | |
| parent | 44f724478aa3b97e69c1609598b98b2cd03d9670 (diff) | |
| download | chromium_src-3f03f1f2dfa411916fc5db22e32a05c6360d6bcc.zip chromium_src-3f03f1f2dfa411916fc5db22e32a05c6360d6bcc.tar.gz chromium_src-3f03f1f2dfa411916fc5db22e32a05c6360d6bcc.tar.bz2 | |
Revert 71487 - Move SystemMonitor to src/ui/base/system_monitor.
Move HiResTimerManager to src/chrome/common.
BUG=none
TEST=none
TBR=brettw
Review URL: http://codereview.chromium.org/6361002
TBR=ben@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71489 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 64f0dd3..961f783 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -8,8 +8,10 @@ #include <string> #include <vector> +#include "app/hi_res_timer_manager.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" +#include "app/system_monitor.h" #include "base/at_exit.h" #include "base/command_line.h" #include "base/debug/trace_event.h" @@ -76,7 +78,6 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/env_vars.h" -#include "chrome/common/hi_res_timer_manager.h" #include "chrome/common/json_pref_store.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/logging_chrome.h" @@ -100,7 +101,6 @@ #include "net/spdy/spdy_session_pool.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_throttler_manager.h" -#include "ui/base/system_monitor/system_monitor.h" #if defined(USE_LINUX_BREAKPAD) #include "base/linux_util.h" @@ -469,7 +469,7 @@ void BrowserMainParts::MainMessageLoopStart() { main_message_loop_.reset(new MessageLoop(MessageLoop::TYPE_UI)); // TODO(viettrungluu): should these really go before setting the thread name? - system_monitor_.reset(new ui::SystemMonitor); + system_monitor_.reset(new SystemMonitor); hi_res_timer_manager_.reset(new HighResolutionTimerManager); network_change_notifier_.reset(net::NetworkChangeNotifier::Create()); |