diff options
| author | oshima <oshima@chromium.org> | 2014-09-12 18:11:07 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-13 01:17:42 +0000 |
| commit | 9eea82dadf7749b42d09d8f423db99cab2a01a72 (patch) | |
| tree | d16cf82ce19ebf30b9fc2b9ee8d74569454a4f18 /ash/root_window_controller.cc | |
| parent | b4f6892dcee61f2831e2cfd49f4afd07120022e6 (diff) | |
| download | chromium_src-9eea82dadf7749b42d09d8f423db99cab2a01a72.zip chromium_src-9eea82dadf7749b42d09d8f423db99cab2a01a72.tar.gz chromium_src-9eea82dadf7749b42d09d8f423db99cab2a01a72.tar.bz2 | |
Run athena on device
Added CHECKs in static methods in ash::Shell/RootWindowController to identify the chrome code accessing ash
BUG=410444
TBR=sky@chromium.org
TEST=tested on Pixel
Review URL: https://codereview.chromium.org/549453005
Cr-Commit-Position: refs/heads/master@{#294717}
Diffstat (limited to 'ash/root_window_controller.cc')
| -rw-r--r-- | ash/root_window_controller.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index 0e07dbe..eb97d25 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()); } |