diff options
| author | bruthig <bruthig@chromium.org> | 2015-06-26 12:37:49 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-26 19:38:28 +0000 |
| commit | 0d89d6ac4a77feaa44da9cb4abb456ca800981b4 (patch) | |
| tree | 6afe2fb3aa328b06407906dd10c7dc3f8f7eb174 /ui/base/ui_base_switches.h | |
| parent | 389da2e28a6e675da59bdb5fb492cbba77df9874 (diff) | |
| download | chromium_src-0d89d6ac4a77feaa44da9cb4abb456ca800981b4.zip chromium_src-0d89d6ac4a77feaa44da9cb4abb456ca800981b4.tar.gz chromium_src-0d89d6ac4a77feaa44da9cb4abb456ca800981b4.tar.bz2 | |
Moved --top-chrome-md command line switch from chrome_switches to ui_base_switches.
The switch needed to be accessible from ui/base/resources for loading the different assets.
Also defined the ENABLE_TOPCHROME_MD compile time switch on linux builds.
TEST=MaterialDesignControllerTest.NonMaterialModeWhenCompileTimeFlagDisabled
TEST=MaterialDesignControllerTest.EnabledCommandLineValueMapsToMaterialModeWhenCompileTimeFlagEnabled
TEST=MaterialDesignControllerTest.EnabledHybridCommandLineValueMapsToMaterialHybridModeWhenCompileTimeFlagEnabled
TEST=MaterialDesignControllerTest.DisabledCommandLineValueMapsToNonMaterialModeWhenCompileTimeFlagEnabled
TEST=MaterialDesignControllerTest.NoCommandLineValueMapsToNonMaterialModeWhenCompileTimeFlagEnabled
TEST=MaterialDesignControllerTest.InvalidCommandLineValueFails
BUG=501366
Review URL: https://codereview.chromium.org/1188713007
Cr-Commit-Position: refs/heads/master@{#336442}
Diffstat (limited to 'ui/base/ui_base_switches.h')
| -rw-r--r-- | ui/base/ui_base_switches.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ui/base/ui_base_switches.h b/ui/base/ui_base_switches.h index 5a7c20e..77c17db 100644 --- a/ui/base/ui_base_switches.h +++ b/ui/base/ui_base_switches.h @@ -29,6 +29,14 @@ UI_BASE_EXPORT extern const char kEnableLinkDisambiguationPopup[]; UI_BASE_EXPORT extern const char kEnableTouchDragDrop[]; UI_BASE_EXPORT extern const char kEnableTouchEditing[]; UI_BASE_EXPORT extern const char kLang[]; + +#if defined(ENABLE_TOPCHROME_MD) +UI_BASE_EXPORT extern const char kTopChromeMD[]; +UI_BASE_EXPORT extern const char kTopChromeMDMaterial[]; +UI_BASE_EXPORT extern const char kTopChromeMDMaterialHybrid[]; +UI_BASE_EXPORT extern const char kTopChromeMDNonMaterial[]; +#endif // defined(ENABLE_TOPCHROME_MD) + UI_BASE_EXPORT extern const char kViewerConnect[]; } // namespace switches |