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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/ash/chrome_launcher_prefs.h

Issue 2036353002: mash: Move ash/common/wm/shelf to ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase again Created 4 years, 6 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
« no previous file with comments | « chrome/browser/ui/apps/chrome_app_delegate.cc ('k') | chrome/browser/ui/ash/chrome_launcher_prefs.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/chrome_launcher_prefs.h
diff --git a/chrome/browser/ui/ash/chrome_launcher_prefs.h b/chrome/browser/ui/ash/chrome_launcher_prefs.h
index d5df2d9e9b83dc7e5683ae4769923577d3220211..38786144c1cbfc804028d74452e0d42d3b2a26ad 100644
--- a/chrome/browser/ui/ash/chrome_launcher_prefs.h
+++ b/chrome/browser/ui/ash/chrome_launcher_prefs.h
@@ -8,7 +8,7 @@
#include <string>
#include <vector>
-#include "ash/shelf/shelf_types.h"
+#include "ash/common/shelf/shelf_types.h"
class LauncherControllerHelper;
class PrefService;
@@ -55,11 +55,10 @@ void SetShelfAutoHideBehaviorPref(PrefService* prefs,
ShelfAutoHideBehavior behavior);
// Get or set the shelf alignment preference for a particular display.
-wm::ShelfAlignment GetShelfAlignmentPref(PrefService* prefs,
- int64_t display_id);
+ShelfAlignment GetShelfAlignmentPref(PrefService* prefs, int64_t display_id);
void SetShelfAlignmentPref(PrefService* prefs,
int64_t display_id,
- wm::ShelfAlignment alignment);
+ ShelfAlignment alignment);
// Get the list of pinned apps from preferences.
std::vector<std::string> GetPinnedAppsFromPrefs(
« no previous file with comments | « chrome/browser/ui/apps/chrome_app_delegate.cc ('k') | chrome/browser/ui/ash/chrome_launcher_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698