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

Unified Diff: chrome/browser/chromeos/login/wizard_accessibility_helper.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/chromeos/login/wizard_accessibility_helper.cc
diff --git a/chrome/browser/chromeos/login/wizard_accessibility_helper.cc b/chrome/browser/chromeos/login/wizard_accessibility_helper.cc
index 833052c8cd00bde5eee5e0f931646da91e85e57c..d00ecf46db7c64139210cf86aaecb1efadf7dd16 100644
--- a/chrome/browser/chromeos/login/wizard_accessibility_helper.cc
+++ b/chrome/browser/chromeos/login/wizard_accessibility_helper.cc
@@ -18,18 +18,18 @@
#include "content/public/browser/notification_service.h"
#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"
-#include "views/accelerator.h"
+#include "ui/base/models/accelerator.h"
#include "views/view.h"
namespace chromeos {
-scoped_ptr<views::Accelerator> WizardAccessibilityHelper::accelerator_;
+scoped_ptr<ui::Accelerator> WizardAccessibilityHelper::accelerator_;
// static
-views::Accelerator WizardAccessibilityHelper::GetAccelerator() {
+ui::Accelerator WizardAccessibilityHelper::GetAccelerator() {
if (!WizardAccessibilityHelper::accelerator_.get())
WizardAccessibilityHelper::accelerator_.reset(
- new views::Accelerator(ui::VKEY_Z, false, true, true));
+ new ui::Accelerator(ui::VKEY_Z, false, true, true));
return *(WizardAccessibilityHelper::accelerator_.get());
}
« no previous file with comments | « chrome/browser/chromeos/login/wizard_accessibility_helper.h ('k') | chrome/browser/chromeos/login/wizard_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698