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

Side by Side Diff: ui/views/widget/tooltip_manager_aura.cc

Issue 117983002: Prefix string16 with base:: in ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 7 years 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/views/widget/tooltip_manager_aura.h ('k') | ui/views/widget/tooltip_manager_win.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/views/widget/tooltip_manager_aura.h" 5 #include "ui/views/widget/tooltip_manager_aura.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "ui/aura/client/screen_position_client.h" 8 #include "ui/aura/client/screen_position_client.h"
9 #include "ui/aura/client/tooltip_client.h" 9 #include "ui/aura/client/tooltip_client.h"
10 #include "ui/aura/root_window.h" 10 #include "ui/aura/root_window.h"
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 return root_view->GetTooltipHandlerForPoint(point); 117 return root_view->GetTooltipHandlerForPoint(point);
118 return NULL; 118 return NULL;
119 } 119 }
120 120
121 void TooltipManagerAura::UpdateTooltipForTarget(View* target, 121 void TooltipManagerAura::UpdateTooltipForTarget(View* target,
122 const gfx::Point& point, 122 const gfx::Point& point,
123 aura::Window* root_window) { 123 aura::Window* root_window) {
124 if (target) { 124 if (target) {
125 gfx::Point view_point = point; 125 gfx::Point view_point = point;
126 View::ConvertPointFromWidget(target, &view_point); 126 View::ConvertPointFromWidget(target, &view_point);
127 string16 new_tooltip_text; 127 base::string16 new_tooltip_text;
128 if (!target->GetTooltipText(view_point, &new_tooltip_text)) 128 if (!target->GetTooltipText(view_point, &new_tooltip_text))
129 tooltip_text_.clear(); 129 tooltip_text_.clear();
130 else 130 else
131 tooltip_text_ = new_tooltip_text; 131 tooltip_text_ = new_tooltip_text;
132 } else { 132 } else {
133 tooltip_text_.clear(); 133 tooltip_text_.clear();
134 } 134 }
135 aura::client::GetTooltipClient(root_window)->UpdateTooltip(GetWindow()); 135 aura::client::GetTooltipClient(root_window)->UpdateTooltip(GetWindow());
136 } 136 }
137 137
138 aura::Window* TooltipManagerAura::GetWindow() { 138 aura::Window* TooltipManagerAura::GetWindow() {
139 return widget_->GetNativeView(); 139 return widget_->GetNativeView();
140 } 140 }
141 141
142 } // namespace views. 142 } // namespace views.
OLDNEW
« no previous file with comments | « ui/views/widget/tooltip_manager_aura.h ('k') | ui/views/widget/tooltip_manager_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698