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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/wm/aura/wm_shelf_aura.cc

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/wm/aura/wm_shelf_aura.h ('k') | ash/wm/dock/docked_window_layout_manager_unittest.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.cc
diff --git a/ash/wm/aura/wm_shelf_aura.cc b/ash/wm/aura/wm_shelf_aura.cc
index 82a9ea9bb8663bdd495c4ff0fa0fe3b4f1f1f888..1bcc0ba70dd20631e541c5ee2e468b7c9ad97f3e 100644
--- a/ash/wm/aura/wm_shelf_aura.cc
+++ b/ash/wm/aura/wm_shelf_aura.cc
@@ -4,7 +4,7 @@
#include "ash/wm/aura/wm_shelf_aura.h"
-#include "ash/common/wm/shelf/wm_shelf_observer.h"
+#include "ash/common/shelf/wm_shelf_observer.h"
#include "ash/common/wm/wm_window.h"
#include "ash/shelf/shelf.h"
#include "ash/shelf/shelf_layout_manager.h"
@@ -76,7 +76,7 @@ void WmShelfAura::WillDeleteShelfLayoutManager() {
}
void WmShelfAura::OnBackgroundUpdated(
- wm::ShelfBackgroundType background_type,
+ ShelfBackgroundType background_type,
BackgroundAnimatorChangeType change_type) {
FOR_EACH_OBSERVER(WmShelfObserver, observers_,
OnBackgroundUpdated(background_type, change_type));
« ash/common/shelf/wm_shelf_util.cc ('K') | « ash/wm/aura/wm_shelf_aura.h ('k') | ash/wm/dock/docked_window_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698