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

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

Issue 3447008: base: Finish moving the SplitString functions from string_util.h to string_split.h (Closed) Base URL: git://git.chromium.org/chromium.git
Patch Set: chromeos 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
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
11 #include "app/hi_res_timer_manager.h" 11 #include "app/hi_res_timer_manager.h"
12 #include "app/l10n_util.h" 12 #include "app/l10n_util.h"
13 #include "app/resource_bundle.h" 13 #include "app/resource_bundle.h"
14 #include "app/system_monitor.h" 14 #include "app/system_monitor.h"
15 #include "base/at_exit.h" 15 #include "base/at_exit.h"
16 #include "base/command_line.h" 16 #include "base/command_line.h"
17 #include "base/field_trial.h" 17 #include "base/field_trial.h"
18 #include "base/file_path.h" 18 #include "base/file_path.h"
19 #include "base/file_util.h" 19 #include "base/file_util.h"
20 #include "base/histogram.h" 20 #include "base/histogram.h"
21 #include "base/scoped_nsautorelease_pool.h" 21 #include "base/scoped_nsautorelease_pool.h"
22 #include "base/path_service.h" 22 #include "base/path_service.h"
23 #include "base/platform_thread.h" 23 #include "base/platform_thread.h"
24 #include "base/process_util.h" 24 #include "base/process_util.h"
25 #include "base/string_number_conversions.h" 25 #include "base/string_number_conversions.h"
26 #include "base/string_piece.h" 26 #include "base/string_piece.h"
27 #include "base/string_split.h"
27 #include "base/string_util.h" 28 #include "base/string_util.h"
28 #include "base/sys_string_conversions.h" 29 #include "base/sys_string_conversions.h"
29 #include "base/time.h" 30 #include "base/time.h"
30 #include "base/trace_event.h" 31 #include "base/trace_event.h"
31 #include "base/utf_string_conversions.h" 32 #include "base/utf_string_conversions.h"
32 #include "base/values.h" 33 #include "base/values.h"
33 #include "build/build_config.h" 34 #include "build/build_config.h"
34 #include "chrome/browser/browser.h" 35 #include "chrome/browser/browser.h"
35 #include "chrome/browser/browser_main_win.h" 36 #include "chrome/browser/browser_main_win.h"
36 #include "chrome/browser/browser_init.h" 37 #include "chrome/browser/browser_init.h"
(...skipping 1469 matching lines...) Expand 10 before | Expand all | Expand 10 after
1506 metrics->Stop(); 1507 metrics->Stop();
1507 1508
1508 // browser_shutdown takes care of deleting browser_process, so we need to 1509 // browser_shutdown takes care of deleting browser_process, so we need to
1509 // release it. 1510 // release it.
1510 ignore_result(browser_process.release()); 1511 ignore_result(browser_process.release());
1511 browser_shutdown::Shutdown(); 1512 browser_shutdown::Shutdown();
1512 1513
1513 TRACE_EVENT_END("BrowserMain", 0, 0); 1514 TRACE_EVENT_END("BrowserMain", 0, 0);
1514 return result_code; 1515 return result_code;
1515 } 1516 }
OLDNEW
« no previous file with comments | « chrome/browser/bookmarks/bookmark_index_unittest.cc ('k') | chrome/browser/chromeos/input_method/input_method_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698