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

Unified Diff: ash/wm/screen_dimmer.cc

Issue 10442017: Rename GetRootWindow() -> GetPrimaryRootWindow() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: git-try -b linux_chromeos,win_aura Created 8 years, 7 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/wm/root_window_event_filter_unittest.cc ('k') | ash/wm/screen_dimmer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/screen_dimmer.cc
diff --git a/ash/wm/screen_dimmer.cc b/ash/wm/screen_dimmer.cc
index a40a9bc19a16298e8746680f6ade2be92eeee3d7..05c8099509c06f722f99ad8fba1f0829c2dbbd75 100644
--- a/ash/wm/screen_dimmer.cc
+++ b/ash/wm/screen_dimmer.cc
@@ -26,11 +26,11 @@ const int kDimmingTransitionMs = 200;
} // namespace
ScreenDimmer::ScreenDimmer() : currently_dimming_(false) {
- Shell::GetInstance()->GetRootWindow()->AddRootWindowObserver(this);
+ Shell::GetPrimaryRootWindow()->AddRootWindowObserver(this);
}
ScreenDimmer::~ScreenDimmer() {
- Shell::GetInstance()->GetRootWindow()->RemoveRootWindowObserver(this);
+ Shell::GetPrimaryRootWindow()->RemoveRootWindowObserver(this);
}
void ScreenDimmer::SetDimming(bool should_dim) {
@@ -41,7 +41,7 @@ void ScreenDimmer::SetDimming(bool should_dim) {
dimming_layer_.reset(new ui::Layer(ui::LAYER_SOLID_COLOR));
dimming_layer_->SetColor(SK_ColorBLACK);
dimming_layer_->SetOpacity(0.0f);
- ui::Layer* root_layer = Shell::GetRootWindow()->layer();
+ ui::Layer* root_layer = Shell::GetPrimaryRootWindow()->layer();
dimming_layer_->SetBounds(root_layer->bounds());
root_layer->Add(dimming_layer_.get());
root_layer->StackAtTop(dimming_layer_.get());
« no previous file with comments | « ash/wm/root_window_event_filter_unittest.cc ('k') | ash/wm/screen_dimmer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698