OLD | NEW |
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2009 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 "build/build_config.h" | 5 #include "build/build_config.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "app/l10n_util.h" | 9 #include "app/l10n_util.h" |
10 #include "app/resource_bundle.h" | 10 #include "app/resource_bundle.h" |
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
368 switches::kDisableAltWinstation); | 368 switches::kDisableAltWinstation); |
369 // Precreate the desktop and window station used by the renderers. | 369 // Precreate the desktop and window station used by the renderers. |
370 sandbox::TargetPolicy* policy = broker_services->CreatePolicy(); | 370 sandbox::TargetPolicy* policy = broker_services->CreatePolicy(); |
371 sandbox::ResultCode result = policy->CreateAlternateDesktop(use_winsta); | 371 sandbox::ResultCode result = policy->CreateAlternateDesktop(use_winsta); |
372 CHECK(sandbox::SBOX_ERROR_FAILED_TO_SWITCH_BACK_WINSTATION != result); | 372 CHECK(sandbox::SBOX_ERROR_FAILED_TO_SWITCH_BACK_WINSTATION != result); |
373 policy->Release(); | 373 policy->Release(); |
374 } | 374 } |
375 } | 375 } |
376 #endif | 376 #endif |
377 | 377 |
378 std::wstring local_state_path; | 378 FilePath local_state_path; |
379 PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path); | 379 PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path); |
380 bool local_state_file_exists = file_util::PathExists(local_state_path); | 380 bool local_state_file_exists = file_util::PathExists(local_state_path); |
381 | 381 |
382 // Load local state. This includes the application locale so we know which | 382 // Load local state. This includes the application locale so we know which |
383 // locale dll to load. | 383 // locale dll to load. |
384 PrefService* local_state = browser_process->local_state(); | 384 PrefService* local_state = browser_process->local_state(); |
385 DCHECK(local_state); | 385 DCHECK(local_state); |
386 | 386 |
387 // Initialize ResourceBundle which handles files loaded from external | 387 // Initialize ResourceBundle which handles files loaded from external |
388 // sources. This has to be done before uninstall code path and before prefs | 388 // sources. This has to be done before uninstall code path and before prefs |
(...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
841 if (metrics) | 841 if (metrics) |
842 metrics->Stop(); | 842 metrics->Stop(); |
843 | 843 |
844 // browser_shutdown takes care of deleting browser_process, so we need to | 844 // browser_shutdown takes care of deleting browser_process, so we need to |
845 // release it. | 845 // release it. |
846 browser_process.release(); | 846 browser_process.release(); |
847 browser_shutdown::Shutdown(); | 847 browser_shutdown::Shutdown(); |
848 | 848 |
849 return result_code; | 849 return result_code; |
850 } | 850 } |
OLD | NEW |