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

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

Issue 3292019: Printing: Convert several wstrings to string16. (Closed)
Patch Set: Review fixes. Created 10 years, 3 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 | « no previous file | chrome/browser/printing/print_job_unittest.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) 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 1372 matching lines...) Expand 10 before | Expand all | Expand 10 after
1383 sdch_manager.set_sdch_fetcher(new SdchDictionaryFetcher); 1383 sdch_manager.set_sdch_fetcher(new SdchDictionaryFetcher);
1384 sdch_manager.EnableSdchSupport(sdch_supported_domain); 1384 sdch_manager.EnableSdchSupport(sdch_supported_domain);
1385 1385
1386 MetricsService* metrics = InitializeMetrics(parsed_command_line, local_state); 1386 MetricsService* metrics = InitializeMetrics(parsed_command_line, local_state);
1387 InstallJankometer(parsed_command_line); 1387 InstallJankometer(parsed_command_line);
1388 1388
1389 #if defined(OS_WIN) && !defined(GOOGLE_CHROME_BUILD) 1389 #if defined(OS_WIN) && !defined(GOOGLE_CHROME_BUILD)
1390 if (parsed_command_line.HasSwitch(switches::kDebugPrint)) { 1390 if (parsed_command_line.HasSwitch(switches::kDebugPrint)) {
1391 FilePath path = 1391 FilePath path =
1392 parsed_command_line.GetSwitchValuePath(switches::kDebugPrint); 1392 parsed_command_line.GetSwitchValuePath(switches::kDebugPrint);
1393 printing::PrintedDocument::set_debug_dump_path(path.value()); 1393 printing::PrintedDocument::set_debug_dump_path(path);
1394 } 1394 }
1395 #endif 1395 #endif
1396 1396
1397 HandleTestParameters(parsed_command_line); 1397 HandleTestParameters(parsed_command_line);
1398 RecordBreakpadStatusUMA(metrics); 1398 RecordBreakpadStatusUMA(metrics);
1399 1399
1400 // Stat the directory with the inspector's files so that we can know if we 1400 // Stat the directory with the inspector's files so that we can know if we
1401 // should display the entry in the context menu or not. 1401 // should display the entry in the context menu or not.
1402 browser_process->CheckForInspectorFiles(); 1402 browser_process->CheckForInspectorFiles();
1403 1403
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
1521 metrics->Stop(); 1521 metrics->Stop();
1522 1522
1523 // browser_shutdown takes care of deleting browser_process, so we need to 1523 // browser_shutdown takes care of deleting browser_process, so we need to
1524 // release it. 1524 // release it.
1525 ignore_result(browser_process.release()); 1525 ignore_result(browser_process.release());
1526 browser_shutdown::Shutdown(); 1526 browser_shutdown::Shutdown();
1527 1527
1528 TRACE_EVENT_END("BrowserMain", 0, 0); 1528 TRACE_EVENT_END("BrowserMain", 0, 0);
1529 return result_code; 1529 return result_code;
1530 } 1530 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/printing/print_job_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698