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

Unified Diff: chrome/browser/chromeos/login/wizard_accessibility_helper.h

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.h
diff --git a/chrome/browser/chromeos/login/wizard_accessibility_helper.h b/chrome/browser/chromeos/login/wizard_accessibility_helper.h
index 5cd0cfd9b21ea65d21bbdf506b315f17b1f0314c..f89854ce301b7d0c868efb8c6170a6c202605568 100644
--- a/chrome/browser/chromeos/login/wizard_accessibility_helper.h
+++ b/chrome/browser/chromeos/login/wizard_accessibility_helper.h
@@ -11,10 +11,10 @@
#include "chrome/browser/chromeos/login/wizard_accessibility_handler.h"
#include "content/public/browser/notification_registrar.h"
#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/base/models/accelerator.h"
class Profile;
namespace views {
-class Accelerator;
class View;
}
@@ -28,7 +28,7 @@ class WizardAccessibilityHelper {
static WizardAccessibilityHelper* GetInstance();
// Get accelerator for enabling accessibility.
- static views::Accelerator GetAccelerator();
+ static ui::Accelerator GetAccelerator();
// Speak the given text if the accessibility pref is already set. |queue|
// specifies whether this utterance will be queued or spoken immediately.
@@ -59,7 +59,7 @@ class WizardAccessibilityHelper {
void SetAccessibilityEnabled(bool);
- static scoped_ptr<views::Accelerator> accelerator_;
+ static scoped_ptr<ui::Accelerator> accelerator_;
scoped_ptr<WizardAccessibilityHandler> accessibility_handler_;
« no previous file with comments | « chrome/browser/chromeos/login/webui_login_view.cc ('k') | chrome/browser/chromeos/login/wizard_accessibility_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698