Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(464)

Unified Diff: content/plugin/plugin_main.cc

Issue 18063004: Move timing files into base/time, install forwarding headers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ios Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/browser_main_loop.cc ('k') | content/renderer/renderer_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/plugin/plugin_main.cc
diff --git a/content/plugin/plugin_main.cc b/content/plugin/plugin_main.cc
index df47c2149000cd3fbf257f194e6404927e8134e4..69415e05bc7d8f794cd2da87831f2e74572b76cf 100644
--- a/content/plugin/plugin_main.cc
+++ b/content/plugin/plugin_main.cc
@@ -10,11 +10,11 @@
#include "base/bind.h"
#include "base/command_line.h"
-#include "base/hi_res_timer_manager.h"
#include "base/message_loop.h"
#include "base/power_monitor/power_monitor.h"
#include "base/strings/string_util.h"
#include "base/threading/platform_thread.h"
+#include "base/timer/hi_res_timer_manager.h"
#include "content/child/child_process.h"
#include "content/plugin/plugin_thread.h"
#include "content/public/common/content_switches.h"
@@ -56,7 +56,7 @@ int PluginMain(const MainFunctionParams& parameters) {
base::PlatformThread::SetName("CrPluginMain");
base::PowerMonitor power_monitor;
- HighResolutionTimerManager high_resolution_timer_manager;
+ base::HighResolutionTimerManager high_resolution_timer_manager;
const CommandLine& parsed_command_line = parameters.command_line;
« no previous file with comments | « content/browser/browser_main_loop.cc ('k') | content/renderer/renderer_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698