Fix clipboard operations through the wrench menu not working in the find bar or other controls.

chrome/browser/ui/views/frame/browser_view.cc

 // Copyright 2012 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/ui/views/frame/browser_view.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 94 matching lines @@
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/events/event_utils.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/safe_integer_conversions.h"
 #include "ui/gfx/sys_color_change_listener.h"
 #include "ui/views/controls/single_split_view.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/focus/external_focus_tracker.h"
 #include "ui/views/focus/view_storage.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/widget/native_widget.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
 
 #if defined(USE_ASH)
@@ skipping 1375 matching lines @@
 // anything. When someone selects the menu item, we just act as if they hit
 // the keyboard shortcut for the command by sending the associated key press
 // to windows. The real fix to this bug is to disable the commands when they
 // won't do anything. We'll need something like an overall clipboard command
 // manager to do that.
 void BrowserView::Cut() {
   // If a WebContent is focused, call RenderWidgetHost::Cut. Otherwise, e.g. if
   // Omnibox is focused, send a Ctrl+x key event to Chrome. Using RWH interface
   // rather than the fake key event for a WebContent is important since the fake
   // event might be consumed by the web content (crbug.com/137908).
-  if (DoCutCopyPaste(&content::RenderWidgetHost::Cut))
-    return;
-
-  OmniboxView* omnibox_view = GetLocationBarView()->GetLocationEntry();
-  if (!omnibox_view->model()->has_focus())
-    return;
-
-#if defined(OS_WIN) && !defined(USE_AURA)
-  OmniboxViewWin* omnibox_win = GetOmniboxViewWin(omnibox_view);
-  if (omnibox_win) {
-    ::SendMessage(omnibox_win->GetNativeView(), WM_CUT, 0, 0);
-    return;
-  }
+  DoCutCopyPaste(&content::RenderWidgetHost::Cut,
+#if defined(OS_WIN)
+                 WM_CUT,
 #endif
-
-  OmniboxViewViews* omnibox_views = GetOmniboxViewViews(omnibox_view);
-  omnibox_views->ExecuteCommandOnTextField(IDS_APP_CUT);
+                 IDS_APP_CUT);
 }
 
 void BrowserView::Copy() {
-  if (DoCutCopyPaste(&content::RenderWidgetHost::Copy))
-    return;
-
-  OmniboxView* omnibox_view = GetLocationBarView()->GetLocationEntry();
-  if (!omnibox_view->model()->has_focus())
-    return;
-
-#if defined(OS_WIN) && !defined(USE_AURA)
-  OmniboxViewWin* omnibox_win = GetOmniboxViewWin(omnibox_view);
-  if (omnibox_win) {
-    ::SendMessage(omnibox_win->GetNativeView(), WM_COPY, 0, 0);
-    return;
-  }
+  DoCutCopyPaste(&content::RenderWidgetHost::Copy,
+#if defined(OS_WIN)
+                 WM_COPY,
 #endif
-
-  OmniboxViewViews* omnibox_views = GetOmniboxViewViews(omnibox_view);
-  omnibox_views->ExecuteCommandOnTextField(IDS_APP_COPY);
+                 IDS_APP_COPY);
 }
 
 void BrowserView::Paste() {
-  if (DoCutCopyPaste(&content::RenderWidgetHost::Paste))
-    return;
-
-  OmniboxView* omnibox_view = GetLocationBarView()->GetLocationEntry();
-  if (!omnibox_view->model()->has_focus())
-    return;
-
-#if defined(OS_WIN) && !defined(USE_AURA)
-  OmniboxViewWin* omnibox_win = GetOmniboxViewWin(omnibox_view);
-  if (omnibox_win) {
-    ::SendMessage(omnibox_win->GetNativeView(), WM_PASTE, 0, 0);
-    return;
-  }
+  DoCutCopyPaste(&content::RenderWidgetHost::Paste,
+#if defined(OS_WIN)
+                 WM_PASTE,
 #endif
-
-  OmniboxViewViews* omnibox_views = GetOmniboxViewViews(omnibox_view);
-  omnibox_views->ExecuteCommandOnTextField(IDS_APP_PASTE);
+                 IDS_APP_PASTE);
 }
 
 gfx::Rect BrowserView::GetInstantBounds() {
   return contents_->GetPreviewBounds();
 }
 
 bool BrowserView::IsInstantTabShowing() {
   return preview_controller_->preview() != NULL;
 }
 
@@ skipping 1197 matching lines @@
           PasswordManager::FromWebContents(web_contents),
           password_generator,
           browser_.get(),
           GetWidget()->GetThemeProvider());
 
   views::BubbleDelegateView::CreateBubble(bubble);
   bubble->SetAlignment(views::BubbleBorder::ALIGN_ARROW_TO_MID_ANCHOR);
   bubble->Show();
 }
 
-bool BrowserView::DoCutCopyPaste(void (content::RenderWidgetHost::*method)()) {
+void BrowserView::DoCutCopyPaste(void (content::RenderWidgetHost::*method)(),
+#if defined(OS_WIN)
+                                 int windows_msg_id,
+#endif
+                                 int command_id) {
   WebContents* contents = chrome::GetActiveWebContents(browser_.get());
   if (!contents)
-    return false;
+    return;
+  if (DoCutCopyPasteForWebContents(contents, method))
+    return;
+
+  DevToolsWindow* devtools_window =
+      DevToolsWindow::GetDockedInstanceForInspectedTab(contents);
+  if (devtools_window &&
+      DoCutCopyPasteForWebContents(devtools_window->web_contents(), method)) {
+    return;
+  }
+
+  views::FocusManager* focus_manager = GetFocusManager();
+  views::View* focused = focus_manager->GetFocusedView();
+  if (focused->GetClassName() == views::Textfield::kViewClassName) {
+    views::Textfield* textfield = static_cast<views::Textfield*>(focused);
+    textfield->ExecuteCommand(command_id);
+    return;
+  }
+
+#if defined(OS_WIN) && !defined(USE_AURA)
+  OmniboxView* omnibox_view = GetLocationBarView()->GetLocationEntry();
+  if (omnibox_view->model()->has_focus()) {
+    OmniboxViewWin* omnibox_win = GetOmniboxViewWin(omnibox_view);
+    ::SendMessage(omnibox_win->GetNativeView(), windows_msg_id, 0, 0);
+  }
+#endif
+}
+
+bool BrowserView::DoCutCopyPasteForWebContents(
+    WebContents* contents,
+    void (content::RenderWidgetHost::*method)()) {
   gfx::NativeView native_view = contents->GetContentNativeView();
   if (!native_view)
     return false;
 #if defined(USE_AURA)
   if (native_view->HasFocus()) {
 #elif defined(OS_WIN)
   if (native_view == ::GetFocus()) {
 #endif
     (contents->GetRenderViewHost()->*method)();
     return true;
@@ skipping 16 matching lines @@
     modal_browser->window()->Activate();
   }
 
   AppModalDialogQueue::GetInstance()->ActivateModalDialog();
 }
 
 void BrowserView::MaybeStackBookmarkBarAtTop() {
   if (bookmark_bar_view_.get())
     bookmark_bar_view_->MaybeStackAtTop();
 }