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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/aura/wm_root_window_controller_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: 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 | « ash/aura/wm_root_window_controller_aura.h ('k') | ash/aura/wm_shelf_aura.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/aura/wm_root_window_controller_aura.cc
diff --git a/ash/aura/wm_root_window_controller_aura.cc b/ash/aura/wm_root_window_controller_aura.cc
index 397fc7118e1374c080ac7c32d130ad6c15c8313f..b632635ff7f2bc02246da2405cd5226d685a52e1 100644
--- a/ash/aura/wm_root_window_controller_aura.cc
+++ b/ash/aura/wm_root_window_controller_aura.cc
@@ -77,7 +77,7 @@ AlwaysOnTopController* WmRootWindowControllerAura::GetAlwaysOnTopController() {
return root_window_controller_->always_on_top_controller();
}
-wm::WmShelf* WmRootWindowControllerAura::GetShelf() {
+WmShelf* WmRootWindowControllerAura::GetShelf() {
return root_window_controller_->shelf_widget()
? root_window_controller_->shelf_widget()->shelf()->wm_shelf()
: nullptr;
« no previous file with comments | « ash/aura/wm_root_window_controller_aura.h ('k') | ash/aura/wm_shelf_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698