Revert 109394 - WebUI TaskManager: Add "Activate page" feature.

chrome/browser/resources/task_manager/main.js

 // 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.
 
 /** @constructor */
 function TaskManager() { }
 
 cr.addSingletonGetter(TaskManager);
 
 /*
@@ skipping 11 matching lines @@
     ['processId', 'PROCESS_ID_COLUMN', 100, false],
     ['webCoreImageCacheSize', 'WEBCORE_IMAGE_CACHE_COLUMN', 120, false],
     ['webCoreScriptsCacheSize', 'WEBCORE_SCRIPTS_CACHE_COLUMN', 120, false],
     ['webCoreCSSCacheSize', 'WEBCORE_CSS_CACHE_COLUMN', 120, false],
     ['fps', 'FPS_COLUMN', 50, true],
     ['sqliteMemoryUsed', 'SQLITE_MEMORY_USED_COLUMN', 80, false],
     ['goatsTeleported', 'GOATS_TELEPORTED_COLUMN', 80, false],
     ['v8MemoryAllocatedSize', 'JAVASCRIPT_MEMORY_ALLOCATED_COLUMN', 120, false],
 ];
 
-var COMMAND_CONTEXTMENU_COLUMN_PREFIX = 'columnContextMenu';
-var COMMAND_CONTEXTMENU_TABLE_PREFIX = 'tableContextMenu';
-
 var localStrings = new LocalStrings();
 
 TaskManager.prototype = {
   /**
    * Handle window close.
    * @public
    */
   onClose: function () {
     if (!this.disabled_) {
       this.disabled_ = true;
@@ skipping 74 matching lines @@
 
   /**
    * Sends command to enable taskmanager model.
    * @public
    */
   enableTaskManager: function () {
     chrome.send('enableTaskManager');
   },
 
   /**
-   * Sends command to activate a page.
-   * @public
-   */
-  activatePage: function (uniqueId) {
-    chrome.send('activatePage', [uniqueId]);
-  },
-
-  /**
    * Initializes taskmanager.
    * @public
    */
   initialize: function (dialogDom, opt) {
     if (!dialogDom) {
       console.log('ERROR: dialogDom is not defined.');
       return;
     }
 
     this.opt_ = opt;
@@ skipping 90 matching lines @@
 
     this.commandsElement_ = this.document_.createElement('commands');
     this.document_.body.appendChild(this.commandsElement_);
 
     this.columnSelectContextMenu_ = this.document_.createElement('menu');
     for (var i = 0; i < DEFAULT_COLUMNS.length; i++) {
       var column = DEFAULT_COLUMNS[i];
 
       // Creates command element to receive event.
       var command = this.document_.createElement('command');
-      command.id = COMMAND_CONTEXTMENU_COLUMN_PREFIX + '-' + column[0];
+      command.id = 'columnContextMenu-' + column[0];
       cr.ui.Command.decorate(command);
       this.column_menu_commands_[command.id] = command;
       this.commandsElement_.appendChild(command);
 
       // Creates menuitem element.
       var item = this.document_.createElement('menuitem');
       item.command = command;
       command.menuitem = item;
       item.textContent = this.localized_column_[i];
       if (this.is_column_shown_[i])
@@ skipping 10 matching lines @@
     this.document_.addEventListener('command', this.onCommand_.bind(this));
     this.document_.addEventListener('canExecute',
                                     this.onCommandCanExecute_.bind(this));
 
   },
 
   initTableMenu_: function () {
     this.table_menu_commands_ = [];
     this.tableContextMenu_ = this.document_.createElement('menu');
 
-    var addMenuItem = function (tm, command_id, string_id, default_label) {
-      // Creates command element to receive event.
-      var command = tm.document_.createElement('command');
-      command.id = COMMAND_CONTEXTMENU_TABLE_PREFIX + '-' + command_id;
-      cr.ui.Command.decorate(command);
-      tm.table_menu_commands_[command.id] = command;
-      tm.commandsElement_.appendChild(command);
+    // Creates command element to receive event.
+    var command = this.document_.createElement('command');
+    command.id = 'tableContextMenu-inspect';
+    cr.ui.Command.decorate(command);
+    this.table_menu_commands_[command.id] = command;
+    this.commandsElement_.appendChild(command);
 
-      // Creates menuitem element.
-      var item = tm.document_.createElement('menuitem');
-      item.command = command;
-      command.menuitem = item;
-      var localized_label = localStrings.getString(string_id);
-      item.textContent = localized_label || default_label;
-      tm.tableContextMenu_.appendChild(item);
-    };
-
-    addMenuItem(this, 'inspect', 'INSPECT', "Inspect");
-    addMenuItem(this, 'activate', 'ACTIVATE', "Activate");
+    // Creates menuitem element.
+    var item = this.document_.createElement('menuitem');
+    item.command = command;
+    command.menuitem = item;
+    var localized_label = localStrings.getString('INSPECT');
+    item.textContent = (localized_label != "") ? localized_label : "Inspect";
+    this.tableContextMenu_.appendChild(item);
 
     this.document_.body.appendChild(this.tableContextMenu_);
     cr.ui.Menu.decorate(this.tableContextMenu_);
   },
 
   initTable_: function () {
     if (!this.dataModel_ || !this.selectionModel_ || !this.columnModel_) {
       console.log('ERROR: some models are not defined.');
       return;
     }
@@ skipping 52 matching lines @@
           image.src = entry['icon'][i];
           label.appendChild(image);
           var text = this.document_.createElement('div');
           text.className = 'detail-title-text';
           text.textContent = entry['title'][i];
           label.appendChild(text);
 
           cr.ui.contextMenuHandler.addContextMenuProperty(label);
           label.contextMenu = this.tableContextMenu_;
 
-          label.addEventListener('dblclick', (function(uniqueId) {
-              this.activatePage(uniqueId);
-          }).bind(this, entry['uniqueId'][i]));
-
           label.data = entry;
           label.index_in_group = i;
         } else {
           label.textContent = entry[columnId][i];
         }
         label.id = 'detail-' + columnId + '-pid' + entry.processId + '-' + i;
         label.className = 'detail-' + columnId + ' pid' + entry.processId;
         container.appendChild(label);
       }
     }
@@ skipping 34 matching lines @@
     if (!dm)
       return;
     dm.splice(start, length);
   },
 
   /**
    * Respond to a command being executed.
    */
   onCommand_: function(event) {
     var command = event.command;
-    var command_id = command.id.split('-', 2);
-
-    var main_command = command_id[0];
-    var sub_command = command_id[1];
-
-    if (main_command == COMMAND_CONTEXTMENU_COLUMN_PREFIX) {
-      this.onColumnContextMenu_(sub_command, command);
-    } else if (main_command == COMMAND_CONTEXTMENU_TABLE_PREFIX) {
-      var target_unique_id = this.currentContextMenuTarget_;
-
-      if (!target_unique_id)
-        return;
-
-      if (sub_command == 'inspect')
-        this.inspect(target_unique_id);
-      else if (sub_command == 'activate')
-        this.activatePage(target_unique_id);
-
-      this.currentContextMenuTarget_ = undefined;
+    if (command.id.substr(0, 18) == 'columnContextMenu-') {
+      console.log(command.id.substr(18));
+      this.onColumnContextMenu_(command.id.substr(18), command);
+    } else if (command.id == 'tableContextMenu-inspect') {
+      var contextMenuTarget = this.currentContextMenuTarget_;
+      if (contextMenuTarget) {
+        this.inspect(contextMenuTarget);
+        this.currentContextMenuTarget_ = undefined;
+      }
     }
   },
 
   onCommandCanExecute_: function(event) {
     event.canExecute = true;
   },
 
   /**
    * Store resourceIndex of target resource of context menu, because resource
    * will be replaced when it is refleshed.
    */
   onTableContextMenuOpened_: function (e) {
-    var mc = this.table_menu_commands_;
-    var inspect_menuitem =
-        mc[COMMAND_CONTEXTMENU_TABLE_PREFIX + '-inspect'].menuitem;
-    var activate_menuitem =
-        mc[COMMAND_CONTEXTMENU_TABLE_PREFIX + '-activate'].menuitem;
+    var command = this.table_menu_commands_['tableContextMenu-inspect'];
+    var menuItem = command.menuitem;
 
     // Disabled by default.
-    inspect_menuitem.disabled = true;
-    activate_menuitem.disabled = true;
+    menuItem.disabled = true;
+    this.currentContextMenuTarget_ = undefined;
 
     var target = e.target;
     var classes = target.classList;
     while (target &&
         Array.prototype.indexOf.call(classes, 'detail-title') == -1) {
       target = target.parentNode;
       classes = target.classList;
     }
 
     if (!target)
       return;
 
     var index_in_group = target.index_in_group;
 
-    // Sets the uniqueId for current target page under the mouse corsor.
-    this.currentContextMenuTarget_ = target.data['uniqueId'][index_in_group];
-
-    // Enables if the page can be inspected.
-    if (target.data['canInspect'][index_in_group])
-      inspect_menuitem.disabled = false;
-
-    // Enables if the page can be activated.
-    if (target.data['canActivate'][index_in_group])
-      activate_menuitem.disabled = false;
+    var canInspect = target.data['canInspect'][index_in_group];
+    if (canInspect) {
+      menuItem.disabled = false;
+      this.currentContextMenuTarget_ =
+          target.data['uniqueId'][index_in_group];
+    }
   },
 
   onColumnContextMenu_: function(id, command) {
     var menuitem = command.menuitem;
     var checked_item_count = 0;
     var is_uncheck = 0;
 
     // Leaves a item visible when user tries making invisible but it is the
     // last one.
     for (var i = 0; i < DEFAULT_COLUMNS.length; i++) {
@@ skipping 55 matching lines @@
   taskmanager.onTaskChange(start, length, tasks);
 }
 
 function taskRemoved(start, length) {
   // Sometimes this can get called too early.
   if (!taskmanager)
     return;
   taskmanager.onTaskRemove(start, length);
 }