Distinguish incognito tabs from normal tabs in task manager

BUG=234181

Review URL: https://chromiumcodereview.appspot.com/22797010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219541 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 55 insertions, 0 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index db6a3ef..c59699b 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -3533,6 +3533,9 @@ Make sure you do not expose any sensitive information.
       <message name="IDS_TASK_MANAGER_TAB_PREFIX" desc="The prefix for a Task Manager Tab row">
         Tab: <ph name="TAB_NAME">$1<ex>Google</ex></ph>
       </message>
+      <message name="IDS_TASK_MANAGER_TAB_INCOGNITO_PREFIX" desc="The prefix for a Task Manager incognito Tab row (may not be visible if incognito is not open)">
+        Incognito Tab: <ph name="TAB_NAME">$1<ex>Google</ex></ph>
+      </message>
       <message name="IDS_TASK_MANAGER_BACKGROUND_PREFIX" desc="The prefix for a Task Manager background page row">
         Background Page: <ph name="BACKGROUND_PAGE_URL">$1<ex>http://www.google.com</ex></ph>
       </message>
diff --git a/chrome/browser/task_manager/task_manager_util.cc b/chrome/browser/task_manager/task_manager_util.cc
index a79b639..27df180 100644
--- a/chrome/browser/task_manager/task_manager_util.cc
+++ b/chrome/browser/task_manager/task_manager_util.cc
@@ -41,6 +41,8 @@ int GetMessagePrefixID(bool is_app,
     return IDS_TASK_MANAGER_PRERENDER_PREFIX;
   if (is_instant_overlay)
     return IDS_TASK_MANAGER_INSTANT_OVERLAY_PREFIX;
+  if (is_incognito)
+    return IDS_TASK_MANAGER_TAB_INCOGNITO_PREFIX;
 
   return IDS_TASK_MANAGER_TAB_PREFIX;
 }
diff --git a/chrome/browser/task_manager/task_manager_util_unittest.cc b/chrome/browser/task_manager/task_manager_util_unittest.cc
new file mode 100644
index 0000000..1949df5
--- /dev/null
+++ b/chrome/browser/task_manager/task_manager_util_unittest.cc
@@ -0,0 +1,49 @@
+// Copyright 2013 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/task_manager/task_manager_util.h"
+
+#include "base/basictypes.h"
+#include "grit/generated_resources.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace task_manager {
+
+namespace util {
+
+TEST(TaskManagerUtilTest, GetMessagePrefixID) {
+  struct Configuration {
+    bool is_app;
+    bool is_extension;
+    bool is_incognito;
+    bool is_prerender;
+    bool is_instant_overlay;
+    bool is_background;
+    int expected_result;
+  };
+  const Configuration configs[] = {
+      // Use implicit int->bool conversion to save space and keep alignment.
+      {1, 0, 0, 0, 0, 1, IDS_TASK_MANAGER_BACKGROUND_PREFIX},
+      {1, 0, 1, 0, 0, 0, IDS_TASK_MANAGER_APP_INCOGNITO_PREFIX},
+      {1, 0, 0, 0, 0, 0, IDS_TASK_MANAGER_APP_PREFIX},
+      {0, 1, 1, 0, 0, 0, IDS_TASK_MANAGER_EXTENSION_INCOGNITO_PREFIX},
+      {0, 1, 0, 0, 0, 0, IDS_TASK_MANAGER_EXTENSION_PREFIX},
+      {0, 0, 0, 1, 0, 0, IDS_TASK_MANAGER_PRERENDER_PREFIX},
+      {0, 0, 0, 0, 1, 0, IDS_TASK_MANAGER_INSTANT_OVERLAY_PREFIX},
+      {0, 0, 1, 0, 0, 0, IDS_TASK_MANAGER_TAB_INCOGNITO_PREFIX},
+      {0, 0, 0, 0, 0, 0, IDS_TASK_MANAGER_TAB_PREFIX}};
+  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(configs); ++i) {
+    EXPECT_EQ(configs[i].expected_result,
+              GetMessagePrefixID(configs[i].is_app,
+                                 configs[i].is_extension,
+                                 configs[i].is_incognito,
+                                 configs[i].is_prerender,
+                                 configs[i].is_instant_overlay,
+                                 configs[i].is_background));
+  }
+}
+
+} //  namespace util
+
+} //  namespace task_manager
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index a4a6d9c..e0ad6fa 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -1342,6 +1342,7 @@
         'browser/tab_contents/render_view_context_menu_test_util.h',
         'browser/tab_contents/render_view_context_menu_unittest.cc',
         'browser/task_manager/task_manager_unittest.cc',
+        'browser/task_manager/task_manager_util_unittest.cc',
         'browser/task_profiler/task_profiler_data_serializer_unittest.cc',
         'browser/themes/browser_theme_pack_unittest.cc',
         'browser/themes/theme_properties_unittest.cc',