| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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.h" | 5 #include "chrome/browser/task_manager.h" |
| 6 | 6 |
| 7 #include "base/process_util.h" | 7 #include "base/process_util.h" |
| 8 #include "base/stats_table.h" | 8 #include "base/stats_table.h" |
| 9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 10 #include "base/thread.h" | 10 #include "base/thread.h" |
| (...skipping 904 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 915 } | 915 } |
| 916 | 916 |
| 917 // views::LinkController implementation | 917 // views::LinkController implementation |
| 918 void TaskManagerContents::LinkActivated(views::Link* source, | 918 void TaskManagerContents::LinkActivated(views::Link* source, |
| 919 int event_flags) { | 919 int event_flags) { |
| 920 DCHECK(source == about_memory_link_); | 920 DCHECK(source == about_memory_link_); |
| 921 Browser* browser = BrowserList::GetLastActive(); | 921 Browser* browser = BrowserList::GetLastActive(); |
| 922 DCHECK(browser); | 922 DCHECK(browser); |
| 923 browser->OpenURL(GURL("about:memory"), GURL(), NEW_FOREGROUND_TAB, | 923 browser->OpenURL(GURL("about:memory"), GURL(), NEW_FOREGROUND_TAB, |
| 924 PageTransition::LINK); | 924 PageTransition::LINK); |
| 925 // In case the browser window is minimzed, show it. |
| 926 browser->window()->Show(); |
| 925 } | 927 } |
| 926 | 928 |
| 927 void TaskManagerContents::ShowContextMenu(views::View* source, | 929 void TaskManagerContents::ShowContextMenu(views::View* source, |
| 928 int x, | 930 int x, |
| 929 int y, | 931 int y, |
| 930 bool is_mouse_gesture) { | 932 bool is_mouse_gesture) { |
| 931 UpdateStatsCounters(); | 933 UpdateStatsCounters(); |
| 932 Menu menu(this, Menu::TOPLEFT, source->GetWidget()->GetNativeView()); | 934 Menu menu(this, Menu::TOPLEFT, source->GetWidget()->GetNativeView()); |
| 933 for (std::vector<views::TableColumn>::iterator i = | 935 for (std::vector<views::TableColumn>::iterator i = |
| 934 columns_.begin(); i != columns_.end(); ++i) { | 936 columns_.begin(); i != columns_.end(); ++i) { |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1093 } | 1095 } |
| 1094 | 1096 |
| 1095 views::View* TaskManager::GetContentsView() { | 1097 views::View* TaskManager::GetContentsView() { |
| 1096 return contents_.get(); | 1098 return contents_.get(); |
| 1097 } | 1099 } |
| 1098 | 1100 |
| 1099 // static | 1101 // static |
| 1100 TaskManager* TaskManager::GetInstance() { | 1102 TaskManager* TaskManager::GetInstance() { |
| 1101 return Singleton<TaskManager>::get(); | 1103 return Singleton<TaskManager>::get(); |
| 1102 } | 1104 } |
| OLD | NEW |