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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/common/pref_names.h

Issue 1839223003: Add basic Chrome interaction with the mash shelf. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use associated interfaces for observers and item delegates. 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 side-by-side diff with in-line comments
Download patch
« ash/mus/shelf_delegate_mus.cc ('K') | « chrome/chrome_browser_ui.gypi ('k') | chrome/common/pref_names.cc » ('j') | mojo/public/cpp/bindings/associated_interface_ptr_set.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/pref_names.h
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 813916e434ed834f7bc987a9d17d619f9e21474d..4ed0022100fee2ea056d57ac04a8fd8ee9f76c34 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -703,7 +703,7 @@ extern const char kMediaGalleriesUniqueId[];
extern const char kMediaGalleriesRememberedGalleries[];
#endif // !defined(OS_ANDROID)
-#if defined(USE_ASH)
+#if defined(USE_AURA)
extern const char kShelfAlignment[];
extern const char kShelfAlignmentLocal[];
extern const char kShelfAutoHideBehavior[];
@@ -715,9 +715,7 @@ extern const char kLogoutDialogDurationMs[];
extern const char kPinnedLauncherApps[];
extern const char kPolicyPinnedLauncherApps[];
extern const char kShowLogoutButtonInTray[];
-#endif
-#if defined(USE_AURA)
extern const char kMaxSeparationForGestureTouchesInPixels[];
extern const char kSemiLongPressTimeInMs[];
extern const char kTabScrubActivationDelayInMs[];
« ash/mus/shelf_delegate_mus.cc ('K') | « chrome/chrome_browser_ui.gypi ('k') | chrome/common/pref_names.cc » ('j') | mojo/public/cpp/bindings/associated_interface_ptr_set.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698