diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-18 17:30:35 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-18 17:30:35 +0000 |
commit | bf2ecb42b2821b9609ce5736d8218c730011d7db (patch) | |
tree | de6abdf6c894199554631b9ca75405b026198588 /chrome/app | |
parent | 253b073edfdab221f0c71caf5c92759705d04170 (diff) | |
download | chromium_src-bf2ecb42b2821b9609ce5736d8218c730011d7db.zip chromium_src-bf2ecb42b2821b9609ce5736d8218c730011d7db.tar.gz chromium_src-bf2ecb42b2821b9609ce5736d8218c730011d7db.tar.bz2 |
Move renderer_main and renderer_glue to content.
Review URL: http://codereview.chromium.org/6878002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81962 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r-- | chrome/app/chrome_main.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc index bf2e210..eb4f631 100644 --- a/chrome/app/chrome_main.cc +++ b/chrome/app/chrome_main.cc @@ -26,7 +26,6 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_content_client.h" #include "chrome/common/chrome_content_plugin_client.h" -#include "chrome/common/chrome_counters.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_paths_internal.h" #include "chrome/common/chrome_switches.h" @@ -37,6 +36,7 @@ #include "chrome/renderer/chrome_content_renderer_client.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/common/content_client.h" +#include "content/common/content_counters.h" #include "content/common/content_paths.h" #include "content/common/main_function_params.h" #include "content/common/sandbox_init_wrapper.h" @@ -685,7 +685,7 @@ int ChromeMain(int argc, char** argv) { InitializeStatsTable(browser_pid, command_line); base::StatsScope<base::StatsCounterTimer> - startup_timer(chrome::Counters::chrome_main()); + startup_timer(content::Counters::chrome_main()); // Enable the heap profiler as early as possible! EnableHeapProfiler(command_line); |