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

Unified Diff: ash/shelf/shelf_widget.h

Issue 1914093002: Refactors DockedWindowLayoutManager in terms of ash/wm/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@nuke_aura_window
Patch Set: merge 2 trunk 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
Index: ash/shelf/shelf_widget.h
diff --git a/ash/shelf/shelf_widget.h b/ash/shelf/shelf_widget.h
index 3a0d8ff4513f1373ae2a0b405c860b535ee81756..0db944f962e2c4fac4cb71dff5bf936d7be2e2fe 100644
--- a/ash/shelf/shelf_widget.h
+++ b/ash/shelf/shelf_widget.h
@@ -39,12 +39,12 @@ class ASH_EXPORT ShelfWidget : public views::Widget,
static bool ShelfAlignmentAllowed();
void OnShelfAlignmentChanged();
- ShelfAlignment GetAlignment() const;
+ wm::ShelfAlignment GetAlignment() const;
// Sets the shelf's background type.
- void SetPaintsBackground(ShelfBackgroundType background_type,
+ void SetPaintsBackground(wm::ShelfBackgroundType background_type,
BackgroundAnimatorChangeType change_type);
- ShelfBackgroundType GetBackgroundType() const;
+ wm::ShelfBackgroundType GetBackgroundType() const;
// Hide the shelf behind a black bar during e.g. a user transition when |hide|
// is true. The |animation_time_ms| will be used as animation duration.

Powered by Google App Engine
This is Rietveld 408576698