diff options
| author | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-23 04:27:42 +0000 |
|---|---|---|
| committer | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-23 04:27:42 +0000 |
| commit | aad1dcf7c95ee59a48ad27b3108128f77b19e915 (patch) | |
| tree | ba08602b624e023ee81907c66cf420f79b857f7f /chrome/common | |
| parent | e74eb8a81ebe7a30ca21413ea482931fdf0bea54 (diff) | |
| download | chromium_src-aad1dcf7c95ee59a48ad27b3108128f77b19e915.zip chromium_src-aad1dcf7c95ee59a48ad27b3108128f77b19e915.tar.gz chromium_src-aad1dcf7c95ee59a48ad27b3108128f77b19e915.tar.bz2 | |
Landing http://codereview.chromium.org/6894022/ on behalf of dgozman@ since my other CL depends on it.
I need to add few test tweaks that will let us skip testing breaks coming from the fact that this extension is on by default in ChromeOS. These will be removed once this end up being non-component extension - see http://crbug.com/14463
Picasa uploader changes:
- accept multiple files at once;
- better css for preview images;
- fix for loading problem;
- removed testing code.
BUG=chromium-os:14346,chromium-os:14370
TEST=make sure Picasa uploader works for real from file browser
TBR=dgozman
Review URL: http://codereview.chromium.org/6898013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82782 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/chrome_switches.cc | 6 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 564c6ee..953fae6 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -1035,6 +1035,12 @@ const char kScreenSaverUrl[] = "screen-saver-url"; // Flag to trigger ChromeOS system log compression during feedback submit. const char kCompressSystemFeedback[] = "compress-sys-feedback"; +// Flag to skip loading ChromeOS specific component extensions. This one is +// needed to prevent these component interfering with the some of the tests. +// TODO(zelidrag): http://crosbug.com/14463 - we should remove this switch once +// get rid of ChromeOS component extensions with background pages. +const char kSkipChromeOSComponents[] = "skip-chromeos-components"; + // Forces usage of libcros stub implementation. For testing purposes, this // switch separates chrome code from the rest of ChromeOS. const char kForceStubLibcros[] = "force-stub-libcros"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index cb48314..57af2b0 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -292,7 +292,7 @@ extern const char kGuestSession[]; extern const char kStubCros[]; extern const char kScreenSaverUrl[]; extern const char kCompressSystemFeedback[]; -extern const char kEnableAdvancedFileSystem[]; +extern const char kSkipChromeOSComponents[]; #endif #if defined(OS_LINUX) |