Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / task_manager_view.cc

diff --git a/src/chrome/browser/ui/views/task_manager_view.cc b/src/chrome/browser/ui/views/task_manager_view.cc
index 92a82e3..80910be 100644 (file)
--- a/src/chrome/browser/ui/views/task_manager_view.cc
+++ b/src/chrome/browser/ui/views/task_manager_view.cc
@@ -325,8 +325,8 @@ void TaskManagerView::Init() {
                                      ui::TableColumn::RIGHT, -1, 0));
   columns_.back().sortable = true;
   columns_.push_back(ui::TableColumn(
-        IDS_TASK_MANAGER_NACL_DEBUG_STUB_PORT_COLUMN,
-        ui::TableColumn::RIGHT, -1, 0));
+      IDS_TASK_MANAGER_NACL_DEBUG_STUB_PORT_COLUMN,
+      ui::TableColumn::RIGHT, -1, 0));
   columns_.back().sortable = true;
   columns_.push_back(
       ui::TableColumn(IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN,
@@ -351,6 +351,8 @@ void TaskManagerView::Init() {
                                   false);
   tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN,
                                   false);
+  tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_NACL_DEBUG_STUB_PORT_COLUMN,
+                                  false);
   tab_table_->SetColumnVisibility(
       IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN, false);
   tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN,
@@ -591,14 +593,13 @@ void TaskManagerView::ShowContextMenuForView(views::View* source,
        i != columns_.end(); ++i) {
     menu_model.AddCheckItem(i->id, l10n_util::GetStringUTF16(i->id));
   }
-  menu_runner_.reset(new views::MenuRunner(&menu_model));
+  menu_runner_.reset(
+      new views::MenuRunner(&menu_model, views::MenuRunner::CONTEXT_MENU));
   if (menu_runner_->RunMenuAt(GetWidget(),
                               NULL,
                               gfx::Rect(point, gfx::Size()),
                               views::MENU_ANCHOR_TOPLEFT,
-                              source_type,
-                              views::MenuRunner::CONTEXT_MENU) ==
-      views::MenuRunner::MENU_DELETED) {
+                              source_type) == views::MenuRunner::MENU_DELETED) {
     return;
   }
 }