[Mac] Show correct cursor after context menu is closed.

chrome/browser/renderer_host/render_widget_host_view_views.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/renderer_host/render_widget_host_view_views.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 65 matching lines @@
 }
 
 }  // namespace
 
 RenderWidgetHostViewViews::RenderWidgetHostViewViews(RenderWidgetHost* host)
     : host_(host),
       about_to_validate_and_paint_(false),
       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),
       has_composition_text_(false) {
   set_focusable(true);
   host_->SetView(this);
 }
 
 RenderWidgetHostViewViews::~RenderWidgetHostViewViews() {
 }
 
 void RenderWidgetHostViewViews::InitAsChild() {
   Show();
 }
 
 void RenderWidgetHostViewViews::InitAsPopup(
     RenderWidgetHostView* parent_host_view,
     const gfx::Rect& pos) {
   RenderWidgetHostViewViews* parent =
       static_cast<RenderWidgetHostViewViews*>(parent_host_view);
   parent->AddChildView(this);
   // 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
   // how to direct an IPC at a particular View. For now, we simply convert
   // the broken screen coordinates into relative coordinates.
   gfx::Point p(pos.x() - root_view->GetScreenBounds().x(),
                pos.y() - root_view->GetScreenBounds().y());
   views::View::SetBounds(p.x(), p.y(), pos.width(), pos.height());
   Show();
 
@@ skipping 155 matching lines @@
   host_->ViewDestroyed();
   Destroy();
 }
 
 void RenderWidgetHostViewViews::Destroy() {
   // host_'s destruction brought us here, null it out so we don't use it
   host_ = NULL;
   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());
     }
     parent()->RemoveChildView(this);
   }
   MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 }
 
 void RenderWidgetHostViewViews::SetTooltipText(const std::wstring& tip) {
   const int kMaxTooltipLength = 8 << 10;
   // Clamp the tooltip length to kMaxTooltipLength so that we don't
   // accidentally DOS the user with a mega tooltip.
   tooltip_text_ =
       l10n_util::TruncateString(WideToUTF16Hack(tip), kMaxTooltipLength);
   if (GetWidget())
     GetWidget()->TooltipTextChanged(this);
 }
 
 void RenderWidgetHostViewViews::SelectionChanged(const std::string& text,
                                                  const ui::Range& range) {
   // TODO(anicolao): deal with the clipboard without GTK
   NOTIMPLEMENTED();
 }
 
 void RenderWidgetHostViewViews::ShowingContextMenu(bool showing) {
-  is_showing_popup_menu_ = showing;
+  is_showing_context_menu_ = showing;
 }
 
 BackingStore* RenderWidgetHostViewViews::AllocBackingStore(
     const gfx::Size& size) {
   return new BackingStoreSkia(host_, size);
 }
 
 void RenderWidgetHostViewViews::SetBackground(const SkBitmap& background) {
   RenderWidgetHostView::SetBackground(background);
   if (host_)
@@ skipping 345 matching lines @@
   host_->GotFocus();
   host_->SetInputMethodActive(GetInputMethod()->IsActive());
 }
 
 void RenderWidgetHostViewViews::OnBlur() {
   if (!host_)
     return;
   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);
 }
 
 bool RenderWidgetHostViewViews::NeedsInputGrab() {
   return popup_type_ == WebKit::WebPopupTypeSelect;
 }
 
 bool RenderWidgetHostViewViews::IsPopup() {
   return popup_type_ != WebKit::WebPopupTypeNone;
@@ skipping 24 matching lines @@
 
 void RenderWidgetHostViewViews::FinishImeCompositionSession() {
   if (!has_composition_text_)
     return;
   if (host_)
     host_->ImeConfirmComposition();
   DCHECK(GetInputMethod());
   GetInputMethod()->CancelComposition(this);
   has_composition_text_ = false;
 }