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

Side by Side Diff: chrome/browser/chromeos/login/screen_locker.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_SCREEN_LOCKER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREEN_LOCKER_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREEN_LOCKER_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREEN_LOCKER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/task.h" 12 #include "base/task.h"
13 #include "base/time.h" 13 #include "base/time.h"
14 #include "chrome/browser/chromeos/login/login_status_consumer.h" 14 #include "chrome/browser/chromeos/login/login_status_consumer.h"
15 #include "chrome/browser/chromeos/login/screen_locker_delegate.h" 15 #include "chrome/browser/chromeos/login/screen_locker_delegate.h"
16 #include "views/accelerator.h" 16 #include "ui/base/models/accelerator.h"
17 17
18 namespace gfx { 18 namespace gfx {
19 class Rect; 19 class Rect;
20 } // namespace gfx 20 } // namespace gfx
21 21
22 namespace views { 22 namespace views {
23 class View; 23 class View;
24 } // namespace views 24 } // namespace views
25 25
26 namespace chromeos { 26 namespace chromeos {
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 // Delegate to forward all login status events to. 159 // Delegate to forward all login status events to.
160 // Tests can use this to receive login status events. 160 // Tests can use this to receive login status events.
161 LoginStatusConsumer* login_status_consumer_; 161 LoginStatusConsumer* login_status_consumer_;
162 162
163 DISALLOW_COPY_AND_ASSIGN(ScreenLocker); 163 DISALLOW_COPY_AND_ASSIGN(ScreenLocker);
164 }; 164 };
165 165
166 } // namespace chromeos 166 } // namespace chromeos
167 167
168 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREEN_LOCKER_H_ 168 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREEN_LOCKER_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/frame/browser_view.cc ('k') | chrome/browser/chromeos/login/screen_locker_views.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698