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

Side by Side Diff: content/browser/browser_main_runner.cc

Issue 2218783003: Remove Windows XP cruft in browser_main_runner.cc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Created 4 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/public/browser/browser_main_runner.h" 5 #include "content/public/browser/browser_main_runner.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/debug/debugger.h" 9 #include "base/debug/debugger.h"
10 #include "base/debug/leak_annotations.h" 10 #include "base/debug/leak_annotations.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 if (!initialization_started_) { 80 if (!initialization_started_) {
81 initialization_started_ = true; 81 initialization_started_ = true;
82 82
83 const base::TimeTicks start_time_step1 = base::TimeTicks::Now(); 83 const base::TimeTicks start_time_step1 = base::TimeTicks::Now();
84 84
85 SkGraphics::Init(); 85 SkGraphics::Init();
86 86
87 if (parameters.command_line.HasSwitch(switches::kWaitForDebugger)) 87 if (parameters.command_line.HasSwitch(switches::kWaitForDebugger))
88 base::debug::WaitForDebugger(60, true); 88 base::debug::WaitForDebugger(60, true);
89 89
90 #if defined(OS_WIN)
91 if (base::win::GetVersion() < base::win::VERSION_VISTA) {
92 // When "Extend support of advanced text services to all programs"
93 // (a.k.a. Cicero Unaware Application Support; CUAS) is enabled on
94 // Windows XP and handwriting modules shipped with Office 2003 are
95 // installed, "penjpn.dll" and "skchui.dll" will be loaded and then
96 // crash unless a user installs Office 2003 SP3. To prevent these
97 // modules from being loaded, disable TSF entirely. crbug.com/160914.
98 // TODO(yukawa): Add a high-level wrapper for this instead of calling
99 // Win32 API here directly.
100 ImmDisableTextFrameService(static_cast<DWORD>(-1));
101 }
102 #endif // OS_WIN
103
104 base::StatisticsRecorder::Initialize(); 90 base::StatisticsRecorder::Initialize();
105 91
106 notification_service_.reset(new NotificationServiceImpl); 92 notification_service_.reset(new NotificationServiceImpl);
107 93
108 #if defined(OS_WIN) 94 #if defined(OS_WIN)
109 // Ole must be initialized before starting message pump, so that TSF 95 // Ole must be initialized before starting message pump, so that TSF
110 // (Text Services Framework) module can interact with the message pump 96 // (Text Services Framework) module can interact with the message pump
111 // on Windows 8 Metro mode. 97 // on Windows 8 Metro mode.
112 ole_initializer_.reset(new ui::ScopedOleInitializer); 98 ole_initializer_.reset(new ui::ScopedOleInitializer);
113 // Enable DirectWrite font rendering if needed. 99 // Enable DirectWrite font rendering if needed.
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 BrowserMainRunner* BrowserMainRunner::Create() { 236 BrowserMainRunner* BrowserMainRunner::Create() {
251 return new BrowserMainRunnerImpl(); 237 return new BrowserMainRunnerImpl();
252 } 238 }
253 239
254 // static 240 // static
255 bool BrowserMainRunner::ExitedMainMessageLoop() { 241 bool BrowserMainRunner::ExitedMainMessageLoop() {
256 return g_exited_main_message_loop; 242 return g_exited_main_message_loop;
257 } 243 }
258 244
259 } // namespace content 245 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698