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

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

Issue 1839223003: Add basic Chrome interaction with the mash shelf. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and rebase. Created 4 years, 8 months 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
« no previous file with comments | « chrome/common/pref_names.h ('k') | mash/shelf/public/interfaces/BUILD.gn » ('j') | 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/macros.h" 7 #include "base/macros.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "chrome/common/pref_font_webkit_names.h" 9 #include "chrome/common/pref_font_webkit_names.h"
10 10
(...skipping 1971 matching lines...) Expand 10 before | Expand all | Expand 10 after
1982 1982
1983 // The next media gallery ID to assign. 1983 // The next media gallery ID to assign.
1984 const char kMediaGalleriesUniqueId[] = "media_galleries.gallery_id"; 1984 const char kMediaGalleriesUniqueId[] = "media_galleries.gallery_id";
1985 1985
1986 // A list of dictionaries, where each dictionary represents a known media 1986 // A list of dictionaries, where each dictionary represents a known media
1987 // gallery. 1987 // gallery.
1988 const char kMediaGalleriesRememberedGalleries[] = 1988 const char kMediaGalleriesRememberedGalleries[] =
1989 "media_galleries.remembered_galleries"; 1989 "media_galleries.remembered_galleries";
1990 #endif // !defined(OS_ANDROID) 1990 #endif // !defined(OS_ANDROID)
1991 1991
1992 #if defined(USE_ASH) 1992 #if defined(USE_AURA)
1993 // |kShelfAlignment| and |kShelfAutoHideBehavior| have a local variant. The 1993 // |kShelfAlignment| and |kShelfAutoHideBehavior| have a local variant. The
1994 // local variant is not synced and is used if set. If the local variant is not 1994 // local variant is not synced and is used if set. If the local variant is not
1995 // set its value is set from the synced value (once prefs have been 1995 // set its value is set from the synced value (once prefs have been
1996 // synced). This gives a per-machine setting that is initialized from the last 1996 // synced). This gives a per-machine setting that is initialized from the last
1997 // set value. 1997 // set value.
1998 // These values are default on the machine but can be overridden by per-display 1998 // These values are default on the machine but can be overridden by per-display
1999 // values in kShelfPreferences (unless overridden by managed policy). 1999 // values in kShelfPreferences (unless overridden by managed policy).
2000 // String value corresponding to ash::Shell::ShelfAlignment. 2000 // String value corresponding to ash::Shell::ShelfAlignment.
2001 const char kShelfAlignment[] = "shelf_alignment"; 2001 const char kShelfAlignment[] = "shelf_alignment";
2002 const char kShelfAlignmentLocal[] = "shelf_alignment_local"; 2002 const char kShelfAlignmentLocal[] = "shelf_alignment_local";
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
2193 const char kMediaRouterEnableCloudServices[] = 2193 const char kMediaRouterEnableCloudServices[] =
2194 "media_router.cloudservices.enabled"; 2194 "media_router.cloudservices.enabled";
2195 #endif // defined(GOOGLE_CHROME_BUILD) 2195 #endif // defined(GOOGLE_CHROME_BUILD)
2196 // Whether or not the Media Router first run flow has been acknowledged by the 2196 // Whether or not the Media Router first run flow has been acknowledged by the
2197 // user. 2197 // user.
2198 const char kMediaRouterFirstRunFlowAcknowledged[] = 2198 const char kMediaRouterFirstRunFlowAcknowledged[] =
2199 "media_router.firstrunflow.acknowledged"; 2199 "media_router.firstrunflow.acknowledged";
2200 #endif 2200 #endif
2201 2201
2202 } // namespace prefs 2202 } // namespace prefs
OLDNEW
« no previous file with comments | « chrome/common/pref_names.h ('k') | mash/shelf/public/interfaces/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698