diff options
author | asargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-26 19:58:33 +0000 |
---|---|---|
committer | asargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-26 19:58:33 +0000 |
commit | e6f2e6a9a9699ac290c86a9dd8992e122ed4abd2 (patch) | |
tree | ce84f8906a194c170436eebc7c40ffc6d027d0df /chrome/browser/browser_init.h | |
parent | 5a54d8bb991bb8eb9e31d860d3061d55f48431ac (diff) | |
download | chromium_src-e6f2e6a9a9699ac290c86a9dd8992e122ed4abd2.zip chromium_src-e6f2e6a9a9699ac290c86a9dd8992e122ed4abd2.tar.gz chromium_src-e6f2e6a9a9699ac290c86a9dd8992e122ed4abd2.tar.bz2 |
Revert 53641 - Landing OEM customization CL for Denis
Original CL http://codereview.chromium.org/3026006
Fixed problems with initial locale change freezing Chrome OS on the device.
Added creation of /home/chronos/.oobe_completed flag file.
Removed command line switches for testing customization manifests.
Added StringFetcher class implementation - URL fetcher that downloads content into std::string.
Refactored services customization integration.
Removed sample manifests from Chrome repository. They are submitted into Chromium OS repository at chromeos/src/platform/assets/oem_customization.
BUG=http://crosbug.com/1888
TEST=Manual. Changes to OEM customization manifests on partner partition, namely the initial locale, time zone, and startup page attributes should change OOBE UX accordingly.
Review URL: http://codereview.chromium.org/3064002
TBR=dpolukhin@chromium.org
Review URL: http://codereview.chromium.org/3030020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53662 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_init.h')
-rw-r--r-- | chrome/browser/browser_init.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/browser_init.h b/chrome/browser/browser_init.h index ec83c70..3aa9b70 100644 --- a/chrome/browser/browser_init.h +++ b/chrome/browser/browser_init.h @@ -76,6 +76,13 @@ class BrowserInit { const std::wstring& cur_dir, bool process_startup, int* return_code); +#if defined(OS_CHROMEOS) + // Processes the OEM services customization document and modifies browser + // settings like initial startup page, web apps and extentions. + bool ApplyServicesCustomization( + const chromeos::ServicesCustomizationDocument* customization); +#endif + // LaunchWithProfile --------------------------------------------------------- // // Assists launching the application and appending the initial tabs for a |