Revert 54955 - Merge 54514 ...

chrome/browser/tab_contents/render_view_context_menu.cc

 // Copyright (c) 2010 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 <algorithm>
 #include <set>
 
 #include "chrome/browser/tab_contents/render_view_context_menu.h"
 
 #include "app/l10n_util.h"
@@ skipping 36 matching lines @@
 #include "net/url_request/url_request.h"
 #include "webkit/glue/webmenuitem.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebContextMenuData.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayerAction.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebTextDirection.h"
 
 using WebKit::WebContextMenuData;
 using WebKit::WebMediaPlayerAction;
 
 // static
-const size_t RenderViewContextMenu::kMaxExtensionItemTitleLength = 75;
-// static
-const size_t RenderViewContextMenu::kMaxSelectionTextLength = 50;
-
-// static
 bool RenderViewContextMenu::IsDevToolsURL(const GURL& url) {
   return url.SchemeIs(chrome::kChromeUIScheme) &&
       url.host() == chrome::kChromeUIDevToolsHost;
 }
 
 // static
 bool RenderViewContextMenu::IsSyncResourcesURL(const GURL& url) {
   return url.SchemeIs(chrome::kChromeUIScheme) &&
       url.host() == chrome::kChromeUISyncResourcesHost;
 }
@@ skipping 128 matching lines @@
   // checkbox item because we are going to put the extension icon next to it).
   // If they have more than that, we automatically push them into a submenu.
   string16 title;
   ExtensionMenuItem::List submenu_items;
   if (items.size() > 1 || items[0]->type() != ExtensionMenuItem::NORMAL) {
     title = UTF8ToUTF16(extension->name());
     submenu_items = items;
   } else {
     ExtensionMenuItem* item = items[0];
     extension_item_map_[menu_id] = item->id();
-    title = item->TitleWithReplacement(PrintableSelectionText(),
-                                       kMaxExtensionItemTitleLength);
+    title = item->TitleWithReplacement(PrintableSelectionText());
     submenu_items = GetRelevantExtensionItems(item->children(), params_);
   }
 
   // Now add our item(s) to the menu_model_.
   if (submenu_items.empty()) {
     menu_model_.AddItem(menu_id, title);
   } else {
     menus::SimpleMenuModel* submenu = new menus::SimpleMenuModel(this);
     extension_menu_models_.push_back(submenu);
     menu_model_.AddSubMenu(menu_id, title, submenu);
@@ skipping 20 matching lines @@
         item->type() != ExtensionMenuItem::SEPARATOR &&
         last_type == ExtensionMenuItem::RADIO) {
       menu_model->AddSeparator();
       radio_group_id++;
     }
 
     int menu_id = IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST + (*index)++;
     if (menu_id >= IDC_EXTENSIONS_CONTEXT_CUSTOM_LAST)
       return;
     extension_item_map_[menu_id] = item->id();
-    string16 title = item->TitleWithReplacement(selection_text,
-                                                kMaxExtensionItemTitleLength);
+    string16 title = item->TitleWithReplacement(selection_text);
     if (item->type() == ExtensionMenuItem::NORMAL) {
       ExtensionMenuItem::List children =
           GetRelevantExtensionItems(item->children(), params_);
       if (children.size() == 0) {
         menu_model->AddItem(menu_id, title);
       } else {
         menus::SimpleMenuModel* submenu = new menus::SimpleMenuModel(this);
         extension_menu_models_.push_back(submenu);
         menu_model->AddSubMenu(menu_id, title, submenu);
         RecursivelyAppendExtensionItems(children, submenu, index);
@@ skipping 1103 matching lines @@
     // per tab flag set.
     if (IsDevToolsURL(active_entry->url()) &&
         !command_line.HasSwitch(switches::kProcessPerTab))
       return false;
   }
 
   return true;
 }
 
 string16 RenderViewContextMenu::PrintableSelectionText() {
-  return WideToUTF16(l10n_util::TruncateString(params_.selection_text,
-                                               kMaxSelectionTextLength));
+  return WideToUTF16(l10n_util::TruncateString(params_.selection_text, 50));
 }
 
 // Controller functions --------------------------------------------------------
 
 void RenderViewContextMenu::OpenURL(
     const GURL& url,
     WindowOpenDisposition disposition,
     PageTransition::Type transition) {
   source_tab_contents_->OpenURL(url, GURL(), disposition, transition);
 }
@@ skipping 15 matching lines @@
       UTF8ToWide(profile_->GetPrefs()->GetString(prefs::kAcceptLanguages)),
       g_browser_process->clipboard());
 }
 
 void RenderViewContextMenu::MediaPlayerActionAt(
     const gfx::Point& location,
     const WebMediaPlayerAction& action) {
   source_tab_contents_->render_view_host()->MediaPlayerActionAt(
       location, action);
 }