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

Unified Diff: chrome/browser/chromeos/login/webui_login_view.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/webui_login_view.h
diff --git a/chrome/browser/chromeos/login/webui_login_view.h b/chrome/browser/chromeos/login/webui_login_view.h
index a5f5ce5588d34a726dae6152358dbde7944bcbcd..7826c42e9a4017b5457d18da02af3e14d04a35c2 100644
--- a/chrome/browser/chromeos/login/webui_login_view.h
+++ b/chrome/browser/chromeos/login/webui_login_view.h
@@ -46,7 +46,7 @@ class WebUILoginView : public views::WidgetDelegateView,
// Overridden from views::Views:
virtual bool AcceleratorPressed(
- const views::Accelerator& accelerator) OVERRIDE;
+ const ui::Accelerator& accelerator) OVERRIDE;
virtual std::string GetClassName() const OVERRIDE;
// Called when WebUI window is created.
@@ -104,7 +104,7 @@ class WebUILoginView : public views::WidgetDelegateView,
private:
// Map type for the accelerator-to-identifier map.
- typedef std::map<views::Accelerator, std::string> AccelMap;
+ typedef std::map<ui::Accelerator, std::string> AccelMap;
// Overridden from TabContentsDelegate.
virtual bool HandleContextMenu(const ContextMenuParams& params) OVERRIDE;
« no previous file with comments | « chrome/browser/chromeos/login/screen_locker_views.cc ('k') | chrome/browser/chromeos/login/webui_login_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698