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

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

Issue 11243002: Move the bits of Prefs where production code has only trivially easy (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments, fix gypi problem Created 8 years, 2 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
« no previous file with comments | « chrome/browser/browser_process_impl.cc ('k') | chrome/browser/chromeos/audio/audio_handler.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) 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 <algorithm> 7 #include <algorithm>
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/trace_event.h" 14 #include "base/debug/trace_event.h"
15 #include "base/file_path.h" 15 #include "base/file_path.h"
16 #include "base/file_util.h" 16 #include "base/file_util.h"
17 #include "base/metrics/field_trial.h" 17 #include "base/metrics/field_trial.h"
18 #include "base/metrics/histogram.h" 18 #include "base/metrics/histogram.h"
19 #include "base/path_service.h" 19 #include "base/path_service.h"
20 #include "base/prefs/json_pref_store.h"
20 #include "base/process_info.h" 21 #include "base/process_info.h"
21 #include "base/process_util.h" 22 #include "base/process_util.h"
22 #include "base/run_loop.h" 23 #include "base/run_loop.h"
23 #include "base/string_number_conversions.h" 24 #include "base/string_number_conversions.h"
24 #include "base/string_piece.h" 25 #include "base/string_piece.h"
25 #include "base/string_split.h" 26 #include "base/string_split.h"
26 #include "base/sys_string_conversions.h" 27 #include "base/sys_string_conversions.h"
27 #include "base/threading/platform_thread.h" 28 #include "base/threading/platform_thread.h"
28 #include "base/time.h" 29 #include "base/time.h"
29 #include "base/utf_string_conversions.h" 30 #include "base/utf_string_conversions.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 #include "chrome/browser/ui/startup/startup_browser_creator.h" 83 #include "chrome/browser/ui/startup/startup_browser_creator.h"
83 #include "chrome/browser/ui/uma_browsing_activity_observer.h" 84 #include "chrome/browser/ui/uma_browsing_activity_observer.h"
84 #include "chrome/browser/ui/user_data_dir_dialog.h" 85 #include "chrome/browser/ui/user_data_dir_dialog.h"
85 #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h" 86 #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h"
86 #include "chrome/common/child_process_logging.h" 87 #include "chrome/common/child_process_logging.h"
87 #include "chrome/common/chrome_constants.h" 88 #include "chrome/common/chrome_constants.h"
88 #include "chrome/common/chrome_paths.h" 89 #include "chrome/common/chrome_paths.h"
89 #include "chrome/common/chrome_result_codes.h" 90 #include "chrome/common/chrome_result_codes.h"
90 #include "chrome/common/chrome_switches.h" 91 #include "chrome/common/chrome_switches.h"
91 #include "chrome/common/env_vars.h" 92 #include "chrome/common/env_vars.h"
92 #include "chrome/common/json_pref_store.h"
93 #include "chrome/common/jstemplate_builder.h" 93 #include "chrome/common/jstemplate_builder.h"
94 #include "chrome/common/logging_chrome.h" 94 #include "chrome/common/logging_chrome.h"
95 #include "chrome/common/metrics/variations/variations_util.h" 95 #include "chrome/common/metrics/variations/variations_util.h"
96 #include "chrome/common/net/net_resource_provider.h" 96 #include "chrome/common/net/net_resource_provider.h"
97 #include "chrome/common/pref_names.h" 97 #include "chrome/common/pref_names.h"
98 #include "chrome/common/profiling.h" 98 #include "chrome/common/profiling.h"
99 #include "chrome/installer/util/google_update_settings.h" 99 #include "chrome/installer/util/google_update_settings.h"
100 #include "content/public/browser/browser_thread.h" 100 #include "content/public/browser/browser_thread.h"
101 #include "content/public/browser/render_process_host.h" 101 #include "content/public/browser/render_process_host.h"
102 #include "content/public/common/content_client.h" 102 #include "content/public/common/content_client.h"
(...skipping 1549 matching lines...) Expand 10 before | Expand all | Expand 10 after
1652 if (base::win::GetVersion() <= base::win::VERSION_XP) 1652 if (base::win::GetVersion() <= base::win::VERSION_XP)
1653 uma_name += "_XP"; 1653 uma_name += "_XP";
1654 1654
1655 uma_name += "_PreRead_"; 1655 uma_name += "_PreRead_";
1656 uma_name += pre_read_percentage; 1656 uma_name += pre_read_percentage;
1657 AddPreReadHistogramTime(uma_name.c_str(), time); 1657 AddPreReadHistogramTime(uma_name.c_str(), time);
1658 } 1658 }
1659 #endif 1659 #endif
1660 #endif 1660 #endif
1661 } 1661 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_process_impl.cc ('k') | chrome/browser/chromeos/audio/audio_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698