Send selected text and page title to pageLauncher.OnClicked.

chrome/browser/ui/toolbar/action_box_button_controller.cc

 // Copyright (c) 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/toolbar/action_box_button_controller.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/extensions/api/page_launcher/page_launcher_api.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/action_box_menu_model.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_set.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
+#include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 
 using content::UserMetricsAction;
 using content::WebContents;
 using extensions::ActionInfo;
 
 void ActionBoxButtonController::Delegate::ShowMenu(
     scoped_ptr<ActionBoxMenuModel> menu_model) {
 }
@@ skipping 49 matching lines @@
 }
 
 void ActionBoxButtonController::ExecuteCommand(int command_id) {
   // If the command id belongs to an extension, dispatch an onClicked event
   // to its pageLauncher.
   ExtensionIdCommandMap::const_iterator it =
       extension_command_ids_.find(command_id);
   if (it != extension_command_ids_.end()) {
     WebContents* web_contents =
         browser_->tab_strip_model()->GetActiveWebContents();
-    // TODO(rfevang): Send page title and selected text.
+
+    std::string page_title = UTF16ToUTF8(web_contents->GetTitle());
+    std::string selected_text =
+        UTF16ToUTF8(web_contents->GetRenderWidgetHostView()->GetSelectedText());
     extensions::PageLauncherAPI::DispatchOnClickedEvent(
         browser_->profile(),
         it->second,
         web_contents->GetURL(),
         web_contents->GetContentsMimeType(),
-        NULL,
-        NULL);
+        page_title.empty() ? NULL : &page_title,
+        selected_text.empty() ? NULL : &selected_text);
     return;
   }
 
   // Otherwise, let the browser handle the command.
   chrome::ExecuteCommand(browser_, command_id);
 }
 
 int ActionBoxButtonController::GetCommandIdForExtension(
     const extensions::Extension& extension) {
   for (ExtensionIdCommandMap::const_iterator it =
@@ skipping 36 matching lines @@
   for (ExtensionIdCommandMap::iterator it = extension_command_ids_.begin();
        it != extension_command_ids_.end();) {
     if (it->second== extension->id())
       extension_command_ids_.erase(it++);
     else
       ++it;
   }
   // TODO(kalman): if there's a menu open, remove it from that too.
   // We may also want to listen to EXTENSION_LOADED to do the opposite.
 }