OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/task_manager/task_manager.h" | 5 #include "chrome/browser/task_manager/task_manager.h" |
6 | 6 |
7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
8 #include "base/metrics/stats_table.h" | 8 #include "base/metrics/stats_table.h" |
9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
10 #include "base/prefs/scoped_user_pref_update.h" | 10 #include "base/prefs/scoped_user_pref_update.h" |
(...skipping 573 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
584 | 584 |
585 void TaskManagerView::ShowContextMenuForView(views::View* source, | 585 void TaskManagerView::ShowContextMenuForView(views::View* source, |
586 const gfx::Point& point, | 586 const gfx::Point& point, |
587 ui::MenuSourceType source_type) { | 587 ui::MenuSourceType source_type) { |
588 UpdateStatsCounters(); | 588 UpdateStatsCounters(); |
589 ui::SimpleMenuModel menu_model(this); | 589 ui::SimpleMenuModel menu_model(this); |
590 for (std::vector<ui::TableColumn>::iterator i(columns_.begin()); | 590 for (std::vector<ui::TableColumn>::iterator i(columns_.begin()); |
591 i != columns_.end(); ++i) { | 591 i != columns_.end(); ++i) { |
592 menu_model.AddCheckItem(i->id, l10n_util::GetStringUTF16(i->id)); | 592 menu_model.AddCheckItem(i->id, l10n_util::GetStringUTF16(i->id)); |
593 } | 593 } |
594 menu_runner_.reset(new views::MenuRunner(&menu_model)); | 594 menu_runner_.reset( |
| 595 new views::MenuRunner(&menu_model, views::MenuRunner::CONTEXT_MENU)); |
595 if (menu_runner_->RunMenuAt(GetWidget(), | 596 if (menu_runner_->RunMenuAt(GetWidget(), |
596 NULL, | 597 NULL, |
597 gfx::Rect(point, gfx::Size()), | 598 gfx::Rect(point, gfx::Size()), |
598 views::MENU_ANCHOR_TOPLEFT, | 599 views::MENU_ANCHOR_TOPLEFT, |
599 source_type, | 600 source_type) == views::MenuRunner::MENU_DELETED) { |
600 views::MenuRunner::CONTEXT_MENU) == | |
601 views::MenuRunner::MENU_DELETED) { | |
602 return; | 601 return; |
603 } | 602 } |
604 } | 603 } |
605 | 604 |
606 bool TaskManagerView::IsCommandIdChecked(int id) const { | 605 bool TaskManagerView::IsCommandIdChecked(int id) const { |
607 return tab_table_->IsColumnVisible(id); | 606 return tab_table_->IsColumnVisible(id); |
608 } | 607 } |
609 | 608 |
610 bool TaskManagerView::IsCommandIdEnabled(int id) const { | 609 bool TaskManagerView::IsCommandIdEnabled(int id) const { |
611 return true; | 610 return true; |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
646 } // namespace | 645 } // namespace |
647 | 646 |
648 namespace chrome { | 647 namespace chrome { |
649 | 648 |
650 // Declared in browser_dialogs.h so others don't need to depend on our header. | 649 // Declared in browser_dialogs.h so others don't need to depend on our header. |
651 void ShowTaskManager(Browser* browser) { | 650 void ShowTaskManager(Browser* browser) { |
652 TaskManagerView::Show(browser); | 651 TaskManagerView::Show(browser); |
653 } | 652 } |
654 | 653 |
655 } // namespace chrome | 654 } // namespace chrome |
OLD | NEW |