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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_WEBUI_LOGIN_VIEW_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_WEBUI_LOGIN_VIEW_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_WEBUI_LOGIN_VIEW_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_WEBUI_LOGIN_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include "chrome/browser/chromeos/login/login_html_dialog.h" 9 #include "chrome/browser/chromeos/login/login_html_dialog.h"
10 #include "chrome/browser/chromeos/status/status_area_button.h" 10 #include "chrome/browser/chromeos/status/status_area_button.h"
(...skipping 28 matching lines...) Expand all
39 static const int kStatusAreaCornerPadding; 39 static const int kStatusAreaCornerPadding;
40 40
41 WebUILoginView(); 41 WebUILoginView();
42 virtual ~WebUILoginView(); 42 virtual ~WebUILoginView();
43 43
44 // Initializes the webui login view. 44 // Initializes the webui login view.
45 virtual void Init(views::Widget* login_window); 45 virtual void Init(views::Widget* login_window);
46 46
47 // Overridden from views::Views: 47 // Overridden from views::Views:
48 virtual bool AcceleratorPressed( 48 virtual bool AcceleratorPressed(
49 const views::Accelerator& accelerator) OVERRIDE; 49 const ui::Accelerator& accelerator) OVERRIDE;
50 virtual std::string GetClassName() const OVERRIDE; 50 virtual std::string GetClassName() const OVERRIDE;
51 51
52 // Called when WebUI window is created. 52 // Called when WebUI window is created.
53 virtual void OnWindowCreated(); 53 virtual void OnWindowCreated();
54 54
55 // Gets the native window from the view widget. 55 // Gets the native window from the view widget.
56 gfx::NativeWindow GetNativeWindow() const; 56 gfx::NativeWindow GetNativeWindow() const;
57 57
58 // Invokes SetWindowType for the window. This is invoked during startup and 58 // Invokes SetWindowType for the window. This is invoked during startup and
59 // after we've painted. 59 // after we've painted.
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 // Creates and adds the status area (separate window). 97 // Creates and adds the status area (separate window).
98 virtual void InitStatusArea(); 98 virtual void InitStatusArea();
99 99
100 StatusAreaViewChromeos* status_area_; 100 StatusAreaViewChromeos* status_area_;
101 101
102 // DOMView for rendering a webpage as a webui login. 102 // DOMView for rendering a webpage as a webui login.
103 DOMView* webui_login_; 103 DOMView* webui_login_;
104 104
105 private: 105 private:
106 // Map type for the accelerator-to-identifier map. 106 // Map type for the accelerator-to-identifier map.
107 typedef std::map<views::Accelerator, std::string> AccelMap; 107 typedef std::map<ui::Accelerator, std::string> AccelMap;
108 108
109 // Overridden from TabContentsDelegate. 109 // Overridden from TabContentsDelegate.
110 virtual bool HandleContextMenu(const ContextMenuParams& params) OVERRIDE; 110 virtual bool HandleContextMenu(const ContextMenuParams& params) OVERRIDE;
111 virtual void HandleKeyboardEvent( 111 virtual void HandleKeyboardEvent(
112 const NativeWebKeyboardEvent& event) OVERRIDE; 112 const NativeWebKeyboardEvent& event) OVERRIDE;
113 virtual bool IsPopupOrPanel(const TabContents* source) const OVERRIDE; 113 virtual bool IsPopupOrPanel(const TabContents* source) const OVERRIDE;
114 virtual bool TakeFocus(bool reverse) OVERRIDE; 114 virtual bool TakeFocus(bool reverse) OVERRIDE;
115 115
116 // Called when focus is returned from status area. 116 // Called when focus is returned from status area.
117 // |reverse| is true when focus is traversed backwards (using Shift-Tab). 117 // |reverse| is true when focus is traversed backwards (using Shift-Tab).
(...skipping 24 matching lines...) Expand all
142 142
143 // Caches StatusArea visibility setting before it has been initialized. 143 // Caches StatusArea visibility setting before it has been initialized.
144 bool status_area_visibility_on_init_; 144 bool status_area_visibility_on_init_;
145 145
146 DISALLOW_COPY_AND_ASSIGN(WebUILoginView); 146 DISALLOW_COPY_AND_ASSIGN(WebUILoginView);
147 }; 147 };
148 148
149 } // namespace chromeos 149 } // namespace chromeos
150 150
151 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_WEBUI_LOGIN_VIEW_H_ 151 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_WEBUI_LOGIN_VIEW_H_
OLDNEW
« 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