diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-26 23:26:56 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-26 23:26:56 +0000 |
| commit | 09f3fc8feccea26a7544a73d7beb485a13949a13 (patch) | |
| tree | bdfddf4e4389f78c398965f74a78504af5e39667 /chrome/common | |
| parent | 3af863ac1a4a40cf7885858873cc549fac9e4f8a (diff) | |
| download | chromium_src-09f3fc8feccea26a7544a73d7beb485a13949a13.zip chromium_src-09f3fc8feccea26a7544a73d7beb485a13949a13.tar.gz chromium_src-09f3fc8feccea26a7544a73d7beb485a13949a13.tar.bz2 | |
Adds option to always hide launcher.
BUG=119803
TEST=see bug
R=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9863007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129045 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/pref_names.cc | 7 | ||||
| -rw-r--r-- | chrome/common/pref_names.h | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc index 8f60a3b8..489a573 100644 --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc @@ -1788,9 +1788,6 @@ const char kRestoreSessionStateDialogShown[] = const char kWebIntentsEnabled[] = "webintents.enabled"; #if defined(USE_AURA) -// Boolean value indicating whether the shelf always hides. -const char kAlwaysAutoHideShelf[] = "auto_hide_shelf"; - const char kPinnedLauncherApps[] = "pinned_launcher_apps"; const char kMaximumSecondsBetweenDoubleClick[] = @@ -1803,6 +1800,10 @@ const char kMinFlickSpeedSquared[] = "gesture.min_flick_speed_squared"; const char kMinimumTouchDownDurationInSecondsForClick[] = "gesture.minimum_touch_down_duration_in_seconds_for_click"; + +// String value corresponding to ash::Shell::ShelfAutoHideBehavior. +const char kShelfAutoHideBehavior[] = "auto_hide_behavior"; + #endif // Indicates whether the browser is in managed mode. diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h index baec892..51e8e6b 100644 --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h @@ -670,8 +670,6 @@ extern const char kRestoreSessionStateDialogShown[]; extern const char kWebIntentsEnabled[]; #if defined(USE_AURA) -extern const char kAlwaysAutoHideShelf[]; - extern const char kPinnedLauncherApps[]; extern const char kMaximumSecondsBetweenDoubleClick[]; @@ -679,6 +677,9 @@ extern const char kMaximumTouchDownDurationInSecondsForClick[]; extern const char kMaximumTouchMoveInPixelsForClick[]; extern const char kMinFlickSpeedSquared[]; extern const char kMinimumTouchDownDurationInSecondsForClick[]; + +extern const char kShelfAutoHideBehavior[]; + #endif extern const char kInManagedMode[]; |