| OLD | NEW |
| 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 |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 79 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
| 80 #include "chrome/browser/search_engines/template_url_service.h" | 80 #include "chrome/browser/search_engines/template_url_service.h" |
| 81 #include "chrome/browser/search_engines/template_url_service_factory.h" | 81 #include "chrome/browser/search_engines/template_url_service_factory.h" |
| 82 #include "chrome/browser/service/service_process_control.h" | 82 #include "chrome/browser/service/service_process_control.h" |
| 83 #include "chrome/browser/shell_integration.h" | 83 #include "chrome/browser/shell_integration.h" |
| 84 #include "chrome/browser/translate/translate_manager.h" | 84 #include "chrome/browser/translate/translate_manager.h" |
| 85 #include "chrome/browser/ui/browser.h" | 85 #include "chrome/browser/ui/browser.h" |
| 86 #include "chrome/browser/ui/browser_finder.h" | 86 #include "chrome/browser/ui/browser_finder.h" |
| 87 #include "chrome/browser/ui/browser_ui_prefs.h" | 87 #include "chrome/browser/ui/browser_ui_prefs.h" |
| 88 #include "chrome/browser/ui/startup/startup_browser_creator.h" | 88 #include "chrome/browser/ui/startup/startup_browser_creator.h" |
| 89 #include "chrome/browser/ui/uma_browsing_activity_observer.h" |
| 89 #include "chrome/browser/ui/user_data_dir_dialog.h" | 90 #include "chrome/browser/ui/user_data_dir_dialog.h" |
| 90 #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h" | 91 #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h" |
| 91 #include "chrome/common/child_process_logging.h" | 92 #include "chrome/common/child_process_logging.h" |
| 92 #include "chrome/common/chrome_constants.h" | 93 #include "chrome/common/chrome_constants.h" |
| 93 #include "chrome/common/chrome_paths.h" | 94 #include "chrome/common/chrome_paths.h" |
| 94 #include "chrome/common/chrome_result_codes.h" | 95 #include "chrome/common/chrome_result_codes.h" |
| 95 #include "chrome/common/chrome_switches.h" | 96 #include "chrome/common/chrome_switches.h" |
| 96 #include "chrome/common/chrome_version_info.h" | 97 #include "chrome/common/chrome_version_info.h" |
| 97 #include "chrome/common/env_vars.h" | 98 #include "chrome/common/env_vars.h" |
| 98 #include "chrome/common/json_pref_store.h" | 99 #include "chrome/common/json_pref_store.h" |
| (...skipping 1187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1286 tracking_objects_.set_output_file_path( | 1287 tracking_objects_.set_output_file_path( |
| 1287 parsed_command_line().GetSwitchValuePath( | 1288 parsed_command_line().GetSwitchValuePath( |
| 1288 switches::kProfilingOutputFile)); | 1289 switches::kProfilingOutputFile)); |
| 1289 } | 1290 } |
| 1290 | 1291 |
| 1291 local_state_ = InitializeLocalState(parsed_command_line(), is_first_run_); | 1292 local_state_ = InitializeLocalState(parsed_command_line(), is_first_run_); |
| 1292 | 1293 |
| 1293 // These members must be initialized before returning from this function. | 1294 // These members must be initialized before returning from this function. |
| 1294 master_prefs_.reset(new first_run::MasterPrefs); | 1295 master_prefs_.reset(new first_run::MasterPrefs); |
| 1295 browser_creator_.reset(new StartupBrowserCreator); | 1296 browser_creator_.reset(new StartupBrowserCreator); |
| 1297 chrome::UMABrowsingActivityObserver::Init(); |
| 1296 | 1298 |
| 1297 #if !defined(OS_ANDROID) | 1299 #if !defined(OS_ANDROID) |
| 1298 // Convert active labs into switches. This needs to be done before | 1300 // Convert active labs into switches. This needs to be done before |
| 1299 // ResourceBundle::InitSharedInstanceWithLocale as some loaded resources are | 1301 // ResourceBundle::InitSharedInstanceWithLocale as some loaded resources are |
| 1300 // affected by experiment flags (--touch-optimized-ui in particular). Not | 1302 // affected by experiment flags (--touch-optimized-ui in particular). Not |
| 1301 // needed on Android as there aren't experimental flags. | 1303 // needed on Android as there aren't experimental flags. |
| 1302 about_flags::ConvertFlagsToSwitches(local_state_, | 1304 about_flags::ConvertFlagsToSwitches(local_state_, |
| 1303 CommandLine::ForCurrentProcess()); | 1305 CommandLine::ForCurrentProcess()); |
| 1304 #endif | 1306 #endif |
| 1305 local_state_->UpdateCommandLinePrefStore(CommandLine::ForCurrentProcess()); | 1307 local_state_->UpdateCommandLinePrefStore(CommandLine::ForCurrentProcess()); |
| (...skipping 773 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2079 if (base::win::GetVersion() <= base::win::VERSION_XP) | 2081 if (base::win::GetVersion() <= base::win::VERSION_XP) |
| 2080 uma_name += "_XP"; | 2082 uma_name += "_XP"; |
| 2081 | 2083 |
| 2082 uma_name += "_PreRead_"; | 2084 uma_name += "_PreRead_"; |
| 2083 uma_name += pre_read_percentage; | 2085 uma_name += pre_read_percentage; |
| 2084 AddPreReadHistogramTime(uma_name.c_str(), time); | 2086 AddPreReadHistogramTime(uma_name.c_str(), time); |
| 2085 } | 2087 } |
| 2086 #endif | 2088 #endif |
| 2087 #endif | 2089 #endif |
| 2088 } | 2090 } |
| OLD | NEW |