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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/wm/aura/wm_shelf_aura.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: gyp 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
« ash/common/shelf/wm_shelf_util.cc ('K') | « ash/test/shelf_view_test_api.cc ('k') | ash/wm/aura/wm_shelf_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/aura/wm_shelf_aura.h
diff --git a/ash/wm/aura/wm_shelf_aura.h b/ash/wm/aura/wm_shelf_aura.h
index e078e418b419f0f0cc4c5b3f21bacc1e4ac239e2..077d222fb57ce32eb1dd23ab5b31aaff13746930 100644
--- a/ash/wm/aura/wm_shelf_aura.h
+++ b/ash/wm/aura/wm_shelf_aura.h
@@ -6,7 +6,7 @@
#define ASH_WM_AURA_WM_SHELF_AURA_H_
#include "ash/ash_export.h"
-#include "ash/common/wm/shelf/wm_shelf.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/shelf/shelf_icon_observer.h"
#include "ash/shelf/shelf_layout_manager_observer.h"
#include "base/macros.h"
@@ -43,7 +43,7 @@ class ASH_EXPORT WmShelfAura : public WmShelf,
// ShelfLayoutManagerObserver:
void WillDeleteShelfLayoutManager() override;
- void OnBackgroundUpdated(wm::ShelfBackgroundType background_type,
+ void OnBackgroundUpdated(ShelfBackgroundType background_type,
BackgroundAnimatorChangeType change_type) override;
void WillChangeVisibilityState(ShelfVisibilityState new_state) override;
« ash/common/shelf/wm_shelf_util.cc ('K') | « ash/test/shelf_view_test_api.cc ('k') | ash/wm/aura/wm_shelf_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698