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

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

Issue 71653003: ash: Rename LauncherModel to ShelfModel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chrome changes Created 7 years, 1 month 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
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "chrome/common/pref_font_webkit_names.h" 8 #include "chrome/common/pref_font_webkit_names.h"
9 9
10 namespace prefs { 10 namespace prefs {
(...skipping 2403 matching lines...) Expand 10 before | Expand all | Expand 10 after
2414 // set value. 2414 // set value.
2415 // These values are default on the machine but can be overridden by per-display 2415 // These values are default on the machine but can be overridden by per-display
2416 // values in kShelfPreferences (unless overridden by managed policy). 2416 // values in kShelfPreferences (unless overridden by managed policy).
2417 // String value corresponding to ash::Shell::ShelfAlignment. 2417 // String value corresponding to ash::Shell::ShelfAlignment.
2418 const char kShelfAlignment[] = "shelf_alignment"; 2418 const char kShelfAlignment[] = "shelf_alignment";
2419 const char kShelfAlignmentLocal[] = "shelf_alignment_local"; 2419 const char kShelfAlignmentLocal[] = "shelf_alignment_local";
2420 // String value corresponding to ash::Shell::ShelfAutoHideBehavior. 2420 // String value corresponding to ash::Shell::ShelfAutoHideBehavior.
2421 const char kShelfAutoHideBehavior[] = "auto_hide_behavior"; 2421 const char kShelfAutoHideBehavior[] = "auto_hide_behavior";
2422 const char kShelfAutoHideBehaviorLocal[] = "auto_hide_behavior_local"; 2422 const char kShelfAutoHideBehaviorLocal[] = "auto_hide_behavior_local";
2423 // This value stores chrome icon's index in the launcher. This should be handled 2423 // This value stores chrome icon's index in the launcher. This should be handled
2424 // separately with app shortcut's index because of LauncherModel's backward 2424 // separately with app shortcut's index because of ShelfModel's backward
2425 // compatability. If we add chrome icon index to |kPinnedLauncherApps|, its 2425 // compatability. If we add chrome icon index to |kPinnedLauncherApps|, its
2426 // index is also stored in the |kPinnedLauncherApp| pref. It may causes 2426 // index is also stored in the |kPinnedLauncherApp| pref. It may causes
2427 // creating two chrome icons. 2427 // creating two chrome icons.
2428 const char kShelfChromeIconIndex[] = "shelf_chrome_icon_index"; 2428 const char kShelfChromeIconIndex[] = "shelf_chrome_icon_index";
2429 2429
2430 const char kPinnedLauncherApps[] = "pinned_launcher_apps"; 2430 const char kPinnedLauncherApps[] = "pinned_launcher_apps";
2431 // Boolean value indicating whether to show a logout button in the ash tray. 2431 // Boolean value indicating whether to show a logout button in the ash tray.
2432 const char kShowLogoutButtonInTray[] = "show_logout_button_in_tray"; 2432 const char kShowLogoutButtonInTray[] = "show_logout_button_in_tray";
2433 // Dictionary value that holds per-display preference of shelf alignment and 2433 // Dictionary value that holds per-display preference of shelf alignment and
2434 // auto-hide behavior. Key of the dictionary is the id of the display, and 2434 // auto-hide behavior. Key of the dictionary is the id of the display, and
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
2617 #if defined(OS_ANDROID) 2617 #if defined(OS_ANDROID)
2618 // A list of partner bookmark rename/remove mappings. 2618 // A list of partner bookmark rename/remove mappings.
2619 // Each list item is a dictionary containing a "url", a "provider_title" and 2619 // Each list item is a dictionary containing a "url", a "provider_title" and
2620 // "mapped_title" entries, detailing the bookmark target URL (if any), the title 2620 // "mapped_title" entries, detailing the bookmark target URL (if any), the title
2621 // given by the PartnerBookmarksProvider and either the user-visible renamed 2621 // given by the PartnerBookmarksProvider and either the user-visible renamed
2622 // title or an empty string if the bookmark node was removed. 2622 // title or an empty string if the bookmark node was removed.
2623 const char kPartnerBookmarkMappings[] = "partnerbookmarks.mappings"; 2623 const char kPartnerBookmarkMappings[] = "partnerbookmarks.mappings";
2624 #endif 2624 #endif
2625 2625
2626 } // namespace prefs 2626 } // namespace prefs
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698