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

Unified Diff: chrome/browser/ui/views/task_manager_view.cc

Issue 8508055: Move views::Accelerator to ui in order to use it from aura code. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 9 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/task_manager_view.cc
diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc
index 766492b91fd381c300a62ae0dabacd25361c3f63..4946b7ebba23a8919a91f2b38ddb694e763bbf97 100644
--- a/chrome/browser/ui/views/task_manager_view.cc
+++ b/chrome/browser/ui/views/task_manager_view.cc
@@ -22,8 +22,8 @@
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
#include "ui/base/l10n/l10n_util.h"
+#include "ui/base/models/accelerator.h"
#include "ui/base/models/table_model_observer.h"
-#include "views/accelerator.h"
#include "views/background.h"
#include "views/context_menu_controller.h"
#include "views/controls/button/text_button.h"
@@ -463,8 +463,8 @@ void TaskManagerView::Init() {
}
kill_button_ = new views::NativeTextButton(
this, UTF16ToWide(l10n_util::GetStringUTF16(IDS_TASK_MANAGER_KILL)));
- kill_button_->AddAccelerator(views::Accelerator(ui::VKEY_E,
- false, false, false));
+ kill_button_->AddAccelerator(ui::Accelerator(ui::VKEY_E, false, false,
+ false));
kill_button_->SetAccessibleKeyboardShortcut(L"E");
kill_button_->set_prefix_type(views::TextButtonBase::PREFIX_SHOW);
about_memory_link_ = new views::Link(
« no previous file with comments | « chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc ('k') | chrome/browser/ui/views/toolbar_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698