| 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 #if defined(TOOLKIT_GTK) | 7 #if defined(TOOLKIT_GTK) |
| 8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
| 9 #endif | 9 #endif |
| 10 | 10 |
| (...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 229 | 229 |
| 230 // Returns the new local state object, guaranteed non-NULL. | 230 // Returns the new local state object, guaranteed non-NULL. |
| 231 // |local_state_task_runner| must be a shutdown-blocking task runner. | 231 // |local_state_task_runner| must be a shutdown-blocking task runner. |
| 232 PrefService* InitializeLocalState( | 232 PrefService* InitializeLocalState( |
| 233 base::SequencedTaskRunner* local_state_task_runner, | 233 base::SequencedTaskRunner* local_state_task_runner, |
| 234 const CommandLine& parsed_command_line, | 234 const CommandLine& parsed_command_line, |
| 235 bool is_first_run) { | 235 bool is_first_run) { |
| 236 TRACE_EVENT0("startup", "ChromeBrowserMainParts::InitializeLocalState") | 236 TRACE_EVENT0("startup", "ChromeBrowserMainParts::InitializeLocalState") |
| 237 base::FilePath local_state_path; | 237 base::FilePath local_state_path; |
| 238 PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path); | 238 PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path); |
| 239 bool local_state_file_exists = file_util::PathExists(local_state_path); | 239 bool local_state_file_exists = base::PathExists(local_state_path); |
| 240 | 240 |
| 241 // Load local state. This includes the application locale so we know which | 241 // Load local state. This includes the application locale so we know which |
| 242 // locale dll to load. This also causes local state prefs to be registered. | 242 // locale dll to load. This also causes local state prefs to be registered. |
| 243 PrefService* local_state = g_browser_process->local_state(); | 243 PrefService* local_state = g_browser_process->local_state(); |
| 244 DCHECK(local_state); | 244 DCHECK(local_state); |
| 245 | 245 |
| 246 if (is_first_run) { | 246 if (is_first_run) { |
| 247 #if defined(OS_WIN) | 247 #if defined(OS_WIN) |
| 248 // During first run we read the google_update registry key to find what | 248 // During first run we read the google_update registry key to find what |
| 249 // language the user selected when downloading the installer. This | 249 // language the user selected when downloading the installer. This |
| (...skipping 1486 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1736 chromeos::CrosSettings::Shutdown(); | 1736 chromeos::CrosSettings::Shutdown(); |
| 1737 #endif | 1737 #endif |
| 1738 #endif | 1738 #endif |
| 1739 } | 1739 } |
| 1740 | 1740 |
| 1741 // Public members: | 1741 // Public members: |
| 1742 | 1742 |
| 1743 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1743 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 1744 chrome_extra_parts_.push_back(parts); | 1744 chrome_extra_parts_.push_back(parts); |
| 1745 } | 1745 } |
| OLD | NEW |