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

Side by Side Diff: chrome/browser/browser_main.cc

Issue 3054042: De-wstringify some browser startup code. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: net fix Created 10 years, 4 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 | « chrome/browser/browser_init.cc ('k') | net/base/net_util.h » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "chrome/browser/browser_main.h" 5 #include "chrome/browser/browser_main.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 1203 matching lines...) Expand 10 before | Expand all | Expand 10 after
1214 1214
1215 SdchManager sdch_manager; // Singleton database. 1215 SdchManager sdch_manager; // Singleton database.
1216 sdch_manager.set_sdch_fetcher(new SdchDictionaryFetcher); 1216 sdch_manager.set_sdch_fetcher(new SdchDictionaryFetcher);
1217 sdch_manager.EnableSdchSupport(sdch_supported_domain); 1217 sdch_manager.EnableSdchSupport(sdch_supported_domain);
1218 1218
1219 MetricsService* metrics = InitializeMetrics(parsed_command_line, local_state); 1219 MetricsService* metrics = InitializeMetrics(parsed_command_line, local_state);
1220 InstallJankometer(parsed_command_line); 1220 InstallJankometer(parsed_command_line);
1221 1221
1222 #if defined(OS_WIN) && !defined(GOOGLE_CHROME_BUILD) 1222 #if defined(OS_WIN) && !defined(GOOGLE_CHROME_BUILD)
1223 if (parsed_command_line.HasSwitch(switches::kDebugPrint)) { 1223 if (parsed_command_line.HasSwitch(switches::kDebugPrint)) {
1224 printing::PrintedDocument::set_debug_dump_path( 1224 FilePath path =
1225 parsed_command_line.GetSwitchValue(switches::kDebugPrint)); 1225 parsed_command_line.GetSwitchValuePath(switches::kDebugPrint);
1226 printing::PrintedDocument::set_debug_dump_path(path.value());
1226 } 1227 }
1227 #endif 1228 #endif
1228 1229
1229 HandleTestParameters(parsed_command_line); 1230 HandleTestParameters(parsed_command_line);
1230 RecordBreakpadStatusUMA(metrics); 1231 RecordBreakpadStatusUMA(metrics);
1231 1232
1232 // Stat the directory with the inspector's files so that we can know if we 1233 // Stat the directory with the inspector's files so that we can know if we
1233 // should display the entry in the context menu or not. 1234 // should display the entry in the context menu or not.
1234 browser_process->CheckForInspectorFiles(); 1235 browser_process->CheckForInspectorFiles();
1235 1236
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
1339 1340
1340 metrics->Stop(); 1341 metrics->Stop();
1341 1342
1342 // browser_shutdown takes care of deleting browser_process, so we need to 1343 // browser_shutdown takes care of deleting browser_process, so we need to
1343 // release it. 1344 // release it.
1344 ignore_result(browser_process.release()); 1345 ignore_result(browser_process.release());
1345 browser_shutdown::Shutdown(); 1346 browser_shutdown::Shutdown();
1346 1347
1347 return result_code; 1348 return result_code;
1348 } 1349 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_init.cc ('k') | net/base/net_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698