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

Unified Diff: ash/tooltips/tooltip_controller.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/test/ash_test_base.cc ('k') | ash/tooltips/tooltip_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/tooltips/tooltip_controller.cc
diff --git a/ash/tooltips/tooltip_controller.cc b/ash/tooltips/tooltip_controller.cc
index cd1edca20fb803906e06546b95148eabcb0f9f67..1036234b241516f27f1f4ea01f7f0e022b8eb070 100644
--- a/ash/tooltips/tooltip_controller.cc
+++ b/ash/tooltips/tooltip_controller.cc
@@ -186,7 +186,7 @@ TooltipController::TooltipController()
tooltip_timer_.Start(FROM_HERE,
base::TimeDelta::FromMilliseconds(kTooltipTimeoutMs),
this, &TooltipController::TooltipTimerFired);
- aura::client::SetTooltipClient(Shell::GetRootWindow(), this);
+ aura::client::SetTooltipClient(Shell::GetPrimaryRootWindow(), this);
}
TooltipController::~TooltipController() {
@@ -373,7 +373,7 @@ void TooltipController::TooltipTimerFired() {
void TooltipController::UpdateIfRequired() {
if (!tooltips_enabled_ || mouse_pressed_ || IsDragDropInProgress() ||
- !Shell::GetRootWindow()->cursor_shown()) {
+ !Shell::GetPrimaryRootWindow()->cursor_shown()) {
tooltip_->Hide();
return;
}
@@ -419,7 +419,7 @@ bool TooltipController::IsTooltipVisible() {
bool TooltipController::IsDragDropInProgress() {
aura::client::DragDropClient* client = aura::client::GetDragDropClient(
- Shell::GetRootWindow());
+ Shell::GetPrimaryRootWindow());
if (client)
return client->IsDragDropInProgress();
return false;
« no previous file with comments | « ash/test/ash_test_base.cc ('k') | ash/tooltips/tooltip_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698