Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(777)

Side by Side Diff: chrome/browser/views/task_manager_view.cc

Issue 165049: Alt+E is the Windows Task Manager shortcut for killing a process. Adding the ... Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 11 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/table_model_observer.h" 8 #include "app/table_model_observer.h"
9 #include "base/stats_table.h" 9 #include "base/stats_table.h"
10 #include "chrome/app/chrome_dll_resource.h" 10 #include "chrome/app/chrome_dll_resource.h"
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 UpdateStatsCounters(); 312 UpdateStatsCounters();
313 TableColumn col(kGoatsTeleportedColumn, L"Goats Teleported", 313 TableColumn col(kGoatsTeleportedColumn, L"Goats Teleported",
314 TableColumn::RIGHT, -1, 0); 314 TableColumn::RIGHT, -1, 0);
315 col.sortable = true; 315 col.sortable = true;
316 columns_.push_back(col); 316 columns_.push_back(col);
317 tab_table_->AddColumn(col); 317 tab_table_->AddColumn(col);
318 tab_table_->SetObserver(this); 318 tab_table_->SetObserver(this);
319 SetContextMenuController(this); 319 SetContextMenuController(this);
320 kill_button_ = new views::NativeButton( 320 kill_button_ = new views::NativeButton(
321 this, l10n_util::GetString(IDS_TASK_MANAGER_KILL)); 321 this, l10n_util::GetString(IDS_TASK_MANAGER_KILL));
322 kill_button_->AddAccelerator(views::Accelerator('E', false, false, true));
322 kill_button_->AddAccelerator(views::Accelerator('E', false, false, false)); 323 kill_button_->AddAccelerator(views::Accelerator('E', false, false, false));
323 kill_button_->SetAccessibleKeyboardShortcut(L"E"); 324
324 about_memory_link_ = new views::Link( 325 about_memory_link_ = new views::Link(
325 l10n_util::GetString(IDS_TASK_MANAGER_ABOUT_MEMORY_LINK)); 326 l10n_util::GetString(IDS_TASK_MANAGER_ABOUT_MEMORY_LINK));
326 about_memory_link_->SetController(this); 327 about_memory_link_->SetController(this);
327 328
328 // Makes sure our state is consistent. 329 // Makes sure our state is consistent.
329 OnSelectionChanged(); 330 OnSelectionChanged();
330 } 331 }
331 332
332 void TaskManagerView::UpdateStatsCounters() { 333 void TaskManagerView::UpdateStatsCounters() {
333 StatsTable* stats = StatsTable::current(); 334 StatsTable* stats = StatsTable::current();
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 625
625 namespace browser { 626 namespace browser {
626 627
627 // Declared in browser_dialogs.h so others don't need to depend on our header. 628 // Declared in browser_dialogs.h so others don't need to depend on our header.
628 void ShowTaskManager() { 629 void ShowTaskManager() {
629 TaskManagerView::Show(); 630 TaskManagerView::Show();
630 } 631 }
631 632
632 } // namespace browser 633 } // namespace browser
633 634
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698