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

Unified Diff: chrome/browser/renderer_host/render_widget_host_view_views.cc

Issue 7227007: [Mac] Show correct cursor after context menu is closed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 5 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
Index: chrome/browser/renderer_host/render_widget_host_view_views.cc
===================================================================
--- chrome/browser/renderer_host/render_widget_host_view_views.cc (revision 92355)
+++ chrome/browser/renderer_host/render_widget_host_view_views.cc (working copy)
@@ -83,7 +83,7 @@
is_hidden_(false),
is_loading_(false),
native_cursor_(NULL),
- is_showing_popup_menu_(false),
+ is_showing_context_menu_(false),
visually_deemphasized_(false),
touch_event_(),
text_input_type_(ui::TEXT_INPUT_TYPE_NONE),
@@ -108,7 +108,7 @@
// If the parent loses focus then the popup will close. So we need
// to tell the parent it's showing a popup so that it doesn't respond to
// blurs.
- parent->is_showing_popup_menu_ = true;
+ parent->is_showing_context_menu_ = true;
views::View* root_view = GetWidget()->GetRootView();
// TODO(fsamuel): WebKit is computing the screen coordinates incorrectly.
// Fixing this is a long and involved process, because WebKit needs to know
@@ -284,7 +284,7 @@
if (parent()) {
if (IsPopup()) {
static_cast<RenderWidgetHostViewViews*>
- (parent())->is_showing_popup_menu_ = false;
+ (parent())->is_showing_context_menu_ = false;
// We're hiding the popup so we need to make sure we repaint
// what's underneath.
parent()->SchedulePaintInRect(bounds());
@@ -311,7 +311,7 @@
}
void RenderWidgetHostViewViews::ShowingContextMenu(bool showing) {
- is_showing_popup_menu_ = showing;
+ is_showing_context_menu_ = showing;
}
BackingStore* RenderWidgetHostViewViews::AllocBackingStore(
@@ -677,7 +677,7 @@
View::OnBlur();
// If we are showing a context menu, maintain the illusion that webkit has
// focus.
- if (!is_showing_popup_menu_ && !is_hidden_)
+ if (!is_showing_context_menu_ && !is_hidden_)
host_->Blur();
host_->SetInputMethodActive(false);
}
« no previous file with comments | « chrome/browser/renderer_host/render_widget_host_view_views.h ('k') | chrome/browser/tab_contents/tab_contents_view_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698