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

Unified Diff: ash/aura/wm_root_window_controller_aura.cc

Issue 2623703002: Removes WmRootWindowController::GetShell() (Closed)
Patch Set: not relative Created 3 years, 11 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/common/wm_root_window_controller.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 368f3ca76bdd719c7f5fe601f46ef9b41c09d153..21964424a5dc01decd82cd9c7d7bb716bc8de349 100644
--- a/ash/aura/wm_root_window_controller_aura.cc
+++ b/ash/aura/wm_root_window_controller_aura.cc
@@ -4,7 +4,6 @@
#include "ash/aura/wm_root_window_controller_aura.h"
-#include "ash/aura/wm_shell_aura.h"
#include "ash/aura/wm_window_aura.h"
#include "ash/common/shelf/shelf_widget.h"
#include "ash/common/shelf/wm_shelf.h"
@@ -61,10 +60,6 @@ bool WmRootWindowControllerAura::HasShelf() {
return root_window_controller_->wm_shelf()->shelf_widget() != nullptr;
}
-WmShell* WmRootWindowControllerAura::GetShell() {
- return WmShell::Get();
-}
-
WmShelf* WmRootWindowControllerAura::GetShelf() {
return root_window_controller_->wm_shelf();
}
« no previous file with comments | « ash/aura/wm_root_window_controller_aura.h ('k') | ash/common/wm_root_window_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698