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

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

Issue 1815563004: Remove iOS ifdefs in src/content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 4 years, 9 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 unified diff | Download patch
« no previous file with comments | « content/browser/browser_main_loop.cc ('k') | content/browser/browser_process_sub_thread.cc » ('j') | 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/leak_annotations.h" 9 #include "base/debug/leak_annotations.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 // tasks. While this is happening a second request can come from the OS or 72 // tasks. While this is happening a second request can come from the OS or
73 // another application to start the browser. If this happens then we must 73 // another application to start the browser. If this happens then we must
74 // not run these parts of initialization twice. 74 // not run these parts of initialization twice.
75 if (!initialization_started_) { 75 if (!initialization_started_) {
76 initialization_started_ = true; 76 initialization_started_ = true;
77 77
78 const base::TimeTicks start_time_step1 = base::TimeTicks::Now(); 78 const base::TimeTicks start_time_step1 = base::TimeTicks::Now();
79 79
80 SkGraphics::Init(); 80 SkGraphics::Init();
81 81
82 #if !defined(OS_IOS)
83 if (parameters.command_line.HasSwitch(switches::kWaitForDebugger)) 82 if (parameters.command_line.HasSwitch(switches::kWaitForDebugger))
84 base::debug::WaitForDebugger(60, true); 83 base::debug::WaitForDebugger(60, true);
85 #endif
86 84
87 #if defined(OS_WIN) 85 #if defined(OS_WIN)
88 if (base::win::GetVersion() < base::win::VERSION_VISTA) { 86 if (base::win::GetVersion() < base::win::VERSION_VISTA) {
89 // When "Extend support of advanced text services to all programs" 87 // When "Extend support of advanced text services to all programs"
90 // (a.k.a. Cicero Unaware Application Support; CUAS) is enabled on 88 // (a.k.a. Cicero Unaware Application Support; CUAS) is enabled on
91 // Windows XP and handwriting modules shipped with Office 2003 are 89 // Windows XP and handwriting modules shipped with Office 2003 are
92 // installed, "penjpn.dll" and "skchui.dll" will be loaded and then 90 // installed, "penjpn.dll" and "skchui.dll" will be loaded and then
93 // crash unless a user installs Office 2003 SP3. To prevent these 91 // crash unless a user installs Office 2003 SP3. To prevent these
94 // modules from being loaded, disable TSF entirely. crbug.com/160914. 92 // modules from being loaded, disable TSF entirely. crbug.com/160914.
95 // TODO(yukawa): Add a high-level wrapper for this instead of calling 93 // TODO(yukawa): Add a high-level wrapper for this instead of calling
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 BrowserMainRunner* BrowserMainRunner::Create() { 245 BrowserMainRunner* BrowserMainRunner::Create() {
248 return new BrowserMainRunnerImpl(); 246 return new BrowserMainRunnerImpl();
249 } 247 }
250 248
251 // static 249 // static
252 bool BrowserMainRunner::ExitedMainMessageLoop() { 250 bool BrowserMainRunner::ExitedMainMessageLoop() {
253 return g_exited_main_message_loop; 251 return g_exited_main_message_loop;
254 } 252 }
255 253
256 } // namespace content 254 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/browser_main_loop.cc ('k') | content/browser/browser_process_sub_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698