diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-27 18:04:56 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-27 18:04:56 +0000 |
| commit | 89bf27e34e49c271aa958c1795d5bccad0e63f88 (patch) | |
| tree | f971f9282a07dbb991a079daade728830df3da2d /content/renderer/renderer_main.cc | |
| parent | aa0ec7b63637a5917ce4be9a0e6cceb26b7a3298 (diff) | |
| download | chromium_src-89bf27e34e49c271aa958c1795d5bccad0e63f88.zip chromium_src-89bf27e34e49c271aa958c1795d5bccad0e63f88.tar.gz chromium_src-89bf27e34e49c271aa958c1795d5bccad0e63f88.tar.bz2 | |
Move timing files into base/time and base/timer, install forwarding headers.
BUG=254986
TEST=none
TBR=brettw@chromium.org
Review URL: https://codereview.chromium.org/18063004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208951 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/renderer_main.cc')
| -rw-r--r-- | content/renderer/renderer_main.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc index 22f5816..af0d60f 100644 --- a/content/renderer/renderer_main.cc +++ b/content/renderer/renderer_main.cc @@ -7,7 +7,6 @@ #include "base/debug/debugger.h" #include "base/debug/stack_trace.h" #include "base/debug/trace_event.h" -#include "base/hi_res_timer_manager.h" #include "base/i18n/rtl.h" #include "base/memory/ref_counted.h" #include "base/message_loop.h" @@ -21,7 +20,8 @@ #include "base/process_util.h" #include "base/strings/string_util.h" #include "base/threading/platform_thread.h" -#include "base/time.h" +#include "base/time/time.h" +#include "base/timer/hi_res_timer_manager.h" #include "content/child/child_process.h" #include "content/common/pepper_plugin_registry.h" #include "content/public/common/content_switches.h" @@ -165,7 +165,7 @@ int RendererMain(const MainFunctionParams& parameters) { base::PlatformThread::SetName("CrRendererMain"); base::PowerMonitor power_monitor; - HighResolutionTimerManager hi_res_timer_manager; + base::HighResolutionTimerManager hi_res_timer_manager; platform.PlatformInitialize(); |