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

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

Issue 322006: BookmarkManager keyboard shortcuts were broken (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 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
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 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 virtual std::wstring GetWindowTitle() const; 208 virtual std::wstring GetWindowTitle() const;
209 virtual std::wstring GetWindowName() const; 209 virtual std::wstring GetWindowName() const;
210 virtual int GetDialogButtons() const; 210 virtual int GetDialogButtons() const;
211 virtual void WindowClosing(); 211 virtual void WindowClosing();
212 virtual void DeleteDelegate(); 212 virtual void DeleteDelegate();
213 virtual views::View* GetContentsView(); 213 virtual views::View* GetContentsView();
214 214
215 // views::TableViewObserver implementation. 215 // views::TableViewObserver implementation.
216 virtual void OnSelectionChanged(); 216 virtual void OnSelectionChanged();
217 virtual void OnDoubleClick(); 217 virtual void OnDoubleClick();
218 virtual void OnKeyDown(unsigned short virtual_keycode); 218 virtual void OnKeyDown(base::KeyboardCode keycode);
219 219
220 // views::LinkController implementation. 220 // views::LinkController implementation.
221 virtual void LinkActivated(views::Link* source, int event_flags); 221 virtual void LinkActivated(views::Link* source, int event_flags);
222 222
223 // Called by the column picker to pick up any new stat counters that 223 // Called by the column picker to pick up any new stat counters that
224 // may have appeared since last time. 224 // may have appeared since last time.
225 void UpdateStatsCounters(); 225 void UpdateStatsCounters();
226 226
227 // Menu::Delegate 227 // Menu::Delegate
228 virtual void ShowContextMenu(views::View* source, 228 virtual void ShowContextMenu(views::View* source,
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 } 575 }
576 } 576 }
577 kill_button_->SetEnabled(!selection_contains_browser_process && 577 kill_button_->SetEnabled(!selection_contains_browser_process &&
578 tab_table_->SelectedRowCount() > 0); 578 tab_table_->SelectedRowCount() > 0);
579 } 579 }
580 580
581 void TaskManagerView::OnDoubleClick() { 581 void TaskManagerView::OnDoubleClick() {
582 ActivateFocusedTab(); 582 ActivateFocusedTab();
583 } 583 }
584 584
585 void TaskManagerView::OnKeyDown(unsigned short virtual_keycode) { 585 void TaskManagerView::OnKeyDown(base::KeyboardCode keycode) {
586 if (virtual_keycode == base::VKEY_RETURN) 586 if (keycode == base::VKEY_RETURN)
587 ActivateFocusedTab(); 587 ActivateFocusedTab();
588 } 588 }
589 589
590 // views::LinkController implementation 590 // views::LinkController implementation
591 void TaskManagerView::LinkActivated(views::Link* source, int event_flags) { 591 void TaskManagerView::LinkActivated(views::Link* source, int event_flags) {
592 DCHECK(source == about_memory_link_); 592 DCHECK(source == about_memory_link_);
593 task_manager_->OpenAboutMemory(); 593 task_manager_->OpenAboutMemory();
594 } 594 }
595 595
596 void TaskManagerView::ShowContextMenu(views::View* source, int x, int y, 596 void TaskManagerView::ShowContextMenu(views::View* source, int x, int y,
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
675 675
676 namespace browser { 676 namespace browser {
677 677
678 // Declared in browser_dialogs.h so others don't need to depend on our header. 678 // Declared in browser_dialogs.h so others don't need to depend on our header.
679 void ShowTaskManager() { 679 void ShowTaskManager() {
680 TaskManagerView::Show(); 680 TaskManagerView::Show();
681 } 681 }
682 682
683 } // namespace browser 683 } // namespace browser
684 684
OLDNEW
« no previous file with comments | « chrome/browser/views/bookmark_manager_view.cc ('k') | views/controls/table/table_view_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698