| Index: chrome/browser/chrome_browser_main_win.cc
|
| diff --git a/chrome/browser/chrome_browser_main_win.cc b/chrome/browser/chrome_browser_main_win.cc
|
| index 0912b3f9e3d1e870b4458675a1886666cbf55079..ba12b9ca64d140389685afb7f594f99d16ac62a3 100644
|
| --- a/chrome/browser/chrome_browser_main_win.cc
|
| +++ b/chrome/browser/chrome_browser_main_win.cc
|
| @@ -152,26 +152,12 @@ int DoUninstallTasks(bool chrome_still_running) {
|
| return result;
|
| }
|
|
|
| -void MaybeEnableHighResolutionTimeEverywhere() {
|
| - chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
|
| - bool user_enabled = CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kEnableHighResolutionTime);
|
| - if (user_enabled || channel == chrome::VersionInfo::CHANNEL_CANARY) {
|
| - bool is_enabled = base::TimeTicks::SetNowIsHighResNowIfSupported();
|
| - if (is_enabled && !user_enabled) {
|
| - // Ensure that all of the renderers will enable it too.
|
| - CommandLine::ForCurrentProcess()->AppendSwitch(
|
| - switches::kEnableHighResolutionTime);
|
| - }
|
| - }
|
| -}
|
| -
|
| // ChromeBrowserMainPartsWin ---------------------------------------------------
|
|
|
| ChromeBrowserMainPartsWin::ChromeBrowserMainPartsWin(
|
| const content::MainFunctionParams& parameters)
|
| : ChromeBrowserMainParts(parameters) {
|
| - MaybeEnableHighResolutionTimeEverywhere();
|
| + base::TimeTicks::SetNowIsHighResNowIfSupported();
|
| if (base::win::IsMetroProcess()) {
|
| typedef const wchar_t* (*GetMetroSwitches)(void);
|
| GetMetroSwitches metro_switches_proc = reinterpret_cast<GetMetroSwitches>(
|
|
|