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

Unified Diff: ash/root_window_controller.cc

Issue 549453005: Run athena on device (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « no previous file | ash/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_controller.cc
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index 0e07dbe03e94cafc518cad419a90bb223e21f37c..eb97d251e9c807a27bc719f7913657b2691a61c8 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -284,17 +284,20 @@ void RootWindowController::CreateForVirtualKeyboardDisplay(
// static
RootWindowController* RootWindowController::ForShelf(
const aura::Window* window) {
+ CHECK(Shell::HasInstance());
return GetRootWindowController(window->GetRootWindow());
}
// static
RootWindowController* RootWindowController::ForWindow(
const aura::Window* window) {
+ CHECK(Shell::HasInstance());
return GetRootWindowController(window->GetRootWindow());
}
// static
RootWindowController* RootWindowController::ForTargetRootWindow() {
+ CHECK(Shell::HasInstance());
return GetRootWindowController(Shell::GetTargetRootWindow());
}
« no previous file with comments | « no previous file | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698