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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/mus/bridge/wm_root_window_controller_mus.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/mus/bridge/wm_root_window_controller_mus.h ('k') | ash/mus/bridge/wm_shelf_mus.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/bridge/wm_root_window_controller_mus.cc
diff --git a/ash/mus/bridge/wm_root_window_controller_mus.cc b/ash/mus/bridge/wm_root_window_controller_mus.cc
index 181af12918141cf2abc7c52ec7a263ef0983563d..274bdd83c0b8e5ee963e431cab4416c7f4a4f6e7 100644
--- a/ash/mus/bridge/wm_root_window_controller_mus.cc
+++ b/ash/mus/bridge/wm_root_window_controller_mus.cc
@@ -96,7 +96,7 @@ AlwaysOnTopController* WmRootWindowControllerMus::GetAlwaysOnTopController() {
return root_window_controller_->always_on_top_controller();
}
-wm::WmShelf* WmRootWindowControllerMus::GetShelf() {
+WmShelf* WmRootWindowControllerMus::GetShelf() {
return root_window_controller_->wm_shelf();
}
« ash/common/shelf/wm_shelf_util.cc ('K') | « ash/mus/bridge/wm_root_window_controller_mus.h ('k') | ash/mus/bridge/wm_shelf_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698