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

Unified Diff: chrome/browser/chromeos/frame/browser_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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/screen_locker.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/frame/browser_view.cc
diff --git a/chrome/browser/chromeos/frame/browser_view.cc b/chrome/browser/chromeos/frame/browser_view.cc
index 27fa0159323a5cf711fe2e36b3171d34ccf1bd3a..489fa046da727f2ba44baf953b7237d28b4e834d 100644
--- a/chrome/browser/chromeos/frame/browser_view.cc
+++ b/chrome/browser/chromeos/frame/browser_view.cc
@@ -71,7 +71,7 @@ class SimpleMenuModelDelegateAdapter : public views::MenuDelegate {
// views::MenuDelegate implementation.
virtual bool GetAccelerator(int id,
- views::Accelerator* accelerator) OVERRIDE;
+ ui::Accelerator* accelerator) OVERRIDE;
virtual string16 GetLabel(int id) const OVERRIDE;
virtual bool IsCommandEnabled(int id) const OVERRIDE;
virtual bool IsItemChecked(int id) const OVERRIDE;
@@ -93,7 +93,7 @@ SimpleMenuModelDelegateAdapter::SimpleMenuModelDelegateAdapter(
bool SimpleMenuModelDelegateAdapter::GetAccelerator(
int id,
- views::Accelerator* accelerator) {
+ ui::Accelerator* accelerator) {
return simple_menu_model_delegate_->GetAcceleratorForCommandId(
id, accelerator);
}
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/screen_locker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698