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

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

Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bad merge Created 6 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 | Annotate | Revision Log
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 "chrome/browser/chrome_browser_main.h" 5 #include "chrome/browser/chrome_browser_main.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/at_exit.h" 11 #include "base/at_exit.h"
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/debug/crash_logging.h" 14 #include "base/debug/crash_logging.h"
15 #include "base/debug/debugger.h" 15 #include "base/debug/debugger.h"
16 #include "base/debug/trace_event.h" 16 #include "base/debug/trace_event.h"
17 #include "base/file_util.h"
18 #include "base/files/file_path.h" 17 #include "base/files/file_path.h"
18 #include "base/files/file_util.h"
19 #include "base/metrics/field_trial.h" 19 #include "base/metrics/field_trial.h"
20 #include "base/metrics/histogram.h" 20 #include "base/metrics/histogram.h"
21 #include "base/path_service.h" 21 #include "base/path_service.h"
22 #include "base/prefs/json_pref_store.h" 22 #include "base/prefs/json_pref_store.h"
23 #include "base/prefs/pref_registry_simple.h" 23 #include "base/prefs/pref_registry_simple.h"
24 #include "base/prefs/pref_service.h" 24 #include "base/prefs/pref_service.h"
25 #include "base/prefs/pref_value_store.h" 25 #include "base/prefs/pref_value_store.h"
26 #include "base/prefs/scoped_user_pref_update.h" 26 #include "base/prefs/scoped_user_pref_update.h"
27 #include "base/process/process_info.h" 27 #include "base/process/process_info.h"
28 #include "base/run_loop.h" 28 #include "base/run_loop.h"
(...skipping 1636 matching lines...) Expand 10 before | Expand all | Expand 10 after
1665 chromeos::CrosSettings::Shutdown(); 1665 chromeos::CrosSettings::Shutdown();
1666 #endif 1666 #endif
1667 #endif 1667 #endif
1668 } 1668 }
1669 1669
1670 // Public members: 1670 // Public members:
1671 1671
1672 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 1672 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
1673 chrome_extra_parts_.push_back(parts); 1673 chrome_extra_parts_.push_back(parts);
1674 } 1674 }
OLDNEW
« no previous file with comments | « chrome/browser/browsing_data/browsing_data_remover_unittest.cc ('k') | chrome/browser/chrome_plugin_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698