diff options
| author | denisromanov@chromium.org <denisromanov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-28 09:20:09 +0000 |
|---|---|---|
| committer | denisromanov@chromium.org <denisromanov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-28 09:20:09 +0000 |
| commit | c3f4ad2f32a6ca339bd079f6e7cdefdf82fa7dde (patch) | |
| tree | 8e7433b4336dc9fdc5fbf1982cda050dda4b50d9 /chrome/common | |
| parent | eb97033e9f98fd08e89e8a914b885696e5e9e9cb (diff) | |
| download | chromium_src-c3f4ad2f32a6ca339bd079f6e7cdefdf82fa7dde.zip chromium_src-c3f4ad2f32a6ca339bd079f6e7cdefdf82fa7dde.tar.gz chromium_src-c3f4ad2f32a6ca339bd079f6e7cdefdf82fa7dde.tar.bz2 | |
Re-landing mistakenly reverted CL http://codereview.chromium.org/2101021.
Adding initial implementation of the PartnerCustomization classes.
BUG=chromiumos:3176
TEST=Run out/Debug/unit_tests. Run out/Debug/chrome --login-manager --startup-manifest=./chrome/browser/chromeos/testdata/startup_manifest.json. There should be no asserts.
TBR=avayvod
Review URL: http://codereview.chromium.org/2333004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48473 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/chrome_switches.cc | 5 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 4723d5d..5596e85 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -895,6 +895,11 @@ const char kLoginUser[] = "login-user"; // Use the frame layout used in chromeos. const char kChromeosFrame[] = "chromeos-frame"; + +// Specify startup customization manifest. +// TODO(denisromanov): delete this once it's not needed for testing anymore. +const char kStartupManifest[] = "startup-manifest"; + #endif #if defined(OS_WIN) diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index 54534ea..eb50a09 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -256,6 +256,7 @@ extern const char kProfile[]; extern const char kLoginProfile[]; extern const char kLoginUser[]; extern const char kChromeosFrame[]; +extern const char kStartupManifest[]; #endif #if defined(OS_WIN) |