Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Side by Side Diff: chrome/common/pref_names.cc

Issue 11570017: Enables storing shelf's auto_hide_behavior and alignment per display. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/common/pref_names.h" 5 #include "chrome/common/pref_names.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 8
9 namespace prefs { 9 namespace prefs {
10 10
(...skipping 2074 matching lines...) Expand 10 before | Expand all | Expand 10 after
2085 const char kMediaGalleriesRememberedGalleries[] = 2085 const char kMediaGalleriesRememberedGalleries[] =
2086 "media_galleries.remembered_galleries"; 2086 "media_galleries.remembered_galleries";
2087 2087
2088 #if defined(USE_AURA) 2088 #if defined(USE_AURA)
2089 // |kShelfAlignment| and |kShelfAutoHideBehavior| have a local variant. The 2089 // |kShelfAlignment| and |kShelfAutoHideBehavior| have a local variant. The
2090 // local variant is not synced and is used if set. If the local variant is not 2090 // local variant is not synced and is used if set. If the local variant is not
2091 // set its value is set from the synced value (once prefs have been 2091 // set its value is set from the synced value (once prefs have been
2092 // synced). This gives a per-machine setting that is initialized from the last 2092 // synced). This gives a per-machine setting that is initialized from the last
2093 // set value. 2093 // set value.
2094 // String value corresponding to ash::Shell::ShelfAlignment. 2094 // String value corresponding to ash::Shell::ShelfAlignment.
2095 const char kShelfAlignment[] = "shelf_alignment"; 2095 const char kShelfAlignment[] = "shelf_alignment";
bartfab (slow) 2012/12/14 09:46:10 Document that these prefs are overridden by per-di
Jun Mukai 2012/12/14 18:47:16 Done.
2096 const char kShelfAlignmentLocal[] = "shelf_alignment_local"; 2096 const char kShelfAlignmentLocal[] = "shelf_alignment_local";
2097 // String value corresponding to ash::Shell::ShelfAutoHideBehavior. 2097 // String value corresponding to ash::Shell::ShelfAutoHideBehavior.
2098 const char kShelfAutoHideBehavior[] = "auto_hide_behavior"; 2098 const char kShelfAutoHideBehavior[] = "auto_hide_behavior";
2099 const char kShelfAutoHideBehaviorLocal[] = "auto_hide_behavior_local"; 2099 const char kShelfAutoHideBehaviorLocal[] = "auto_hide_behavior_local";
2100 const char kPinnedLauncherApps[] = "pinned_launcher_apps"; 2100 const char kPinnedLauncherApps[] = "pinned_launcher_apps";
2101 // Boolean value indicating whether to show a logout button in the ash tray. 2101 // Boolean value indicating whether to show a logout button in the ash tray.
2102 const char kShowLogoutButtonInTray[] = "show_logout_button_in_tray"; 2102 const char kShowLogoutButtonInTray[] = "show_logout_button_in_tray";
2103 // Dictionary value that holds per-display preference of shelf alignment and
2104 // auto-hide behavior. Key of the dictionary is the id of the display, and
2105 // its value is a dictionary of 'alingment' for alignment and
bartfab (slow) 2012/12/14 09:46:10 "Alignment" is misspelled.
Jun Mukai 2012/12/14 18:47:16 thanks... updated, my code is rather using the sam
2106 // 'auto_hide_behavior' for auto hide behavior.
2107 const char kShelfPreferences[] = "shelf_preferences";
2103 2108
2104 const char kFlingVelocityCap[] = "gesture.fling_velocity_cap"; 2109 const char kFlingVelocityCap[] = "gesture.fling_velocity_cap";
2105 const char kLongPressTimeInSeconds[] = 2110 const char kLongPressTimeInSeconds[] =
2106 "gesture.long_press_time_in_seconds"; 2111 "gesture.long_press_time_in_seconds";
2107 const char kMaxDistanceBetweenTapsForDoubleTap[] = 2112 const char kMaxDistanceBetweenTapsForDoubleTap[] =
2108 "gesture.max_distance_between_taps_for_double_tap"; 2113 "gesture.max_distance_between_taps_for_double_tap";
2109 const char kMaxDistanceForTwoFingerTapInPixels[] = 2114 const char kMaxDistanceForTwoFingerTapInPixels[] =
2110 "gesture.max_distance_for_two_finger_tap_in_pixels"; 2115 "gesture.max_distance_for_two_finger_tap_in_pixels";
2111 const char kMaxSecondsBetweenDoubleClick[] = 2116 const char kMaxSecondsBetweenDoubleClick[] =
2112 "gesture.max_seconds_between_double_click"; 2117 "gesture.max_seconds_between_double_click";
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
2175 // 64-bit serialization of the time last policy usage statistics were collected 2180 // 64-bit serialization of the time last policy usage statistics were collected
2176 // by UMA_HISTOGRAM_ENUMERATION. 2181 // by UMA_HISTOGRAM_ENUMERATION.
2177 const char kLastPolicyStatisticsUpdate[] = "policy.last_statistics_update"; 2182 const char kLastPolicyStatisticsUpdate[] = "policy.last_statistics_update";
2178 2183
2179 #if defined(OS_CHROMEOS) 2184 #if defined(OS_CHROMEOS)
2180 // The RLZ brand code, if enabled. 2185 // The RLZ brand code, if enabled.
2181 const char kRLZBrand[] = "rlz.brand"; 2186 const char kRLZBrand[] = "rlz.brand";
2182 #endif 2187 #endif
2183 2188
2184 } // namespace prefs 2189 } // namespace prefs
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698