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

Side by Side Diff: chrome/browser/chromeos/login/lock/screen_locker.h

Issue 750353004: Revert of Moves code from chromeos/ime to ui/base/ime/chromeos. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_LOCK_SCREEN_LOCKER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_SCREEN_LOCKER_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_SCREEN_LOCKER_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_SCREEN_LOCKER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/callback_forward.h" 10 #include "base/callback_forward.h"
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
14 #include "base/sequenced_task_runner_helpers.h" 14 #include "base/sequenced_task_runner_helpers.h"
15 #include "base/time/time.h" 15 #include "base/time/time.h"
16 #include "chrome/browser/chromeos/login/help_app_launcher.h" 16 #include "chrome/browser/chromeos/login/help_app_launcher.h"
17 #include "chrome/browser/chromeos/login/lock/screen_locker_delegate.h" 17 #include "chrome/browser/chromeos/login/lock/screen_locker_delegate.h"
18 #include "chrome/browser/chromeos/login/ui/login_display.h" 18 #include "chrome/browser/chromeos/login/ui/login_display.h"
19 #include "chromeos/ime/input_method_manager.h"
19 #include "chromeos/login/auth/auth_status_consumer.h" 20 #include "chromeos/login/auth/auth_status_consumer.h"
20 #include "chromeos/login/auth/user_context.h" 21 #include "chromeos/login/auth/user_context.h"
21 #include "components/user_manager/user.h" 22 #include "components/user_manager/user.h"
22 #include "ui/base/accelerators/accelerator.h" 23 #include "ui/base/accelerators/accelerator.h"
23 #include "ui/base/ime/chromeos/input_method_manager.h"
24 24
25 namespace content { 25 namespace content {
26 class WebUI; 26 class WebUI;
27 } 27 }
28 28
29 namespace gfx { 29 namespace gfx {
30 class Image; 30 class Image;
31 } 31 }
32 32
33 namespace chromeos { 33 namespace chromeos {
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 scoped_refptr<input_method::InputMethodManager::State> saved_ime_state_; 190 scoped_refptr<input_method::InputMethodManager::State> saved_ime_state_;
191 191
192 base::WeakPtrFactory<ScreenLocker> weak_factory_; 192 base::WeakPtrFactory<ScreenLocker> weak_factory_;
193 193
194 DISALLOW_COPY_AND_ASSIGN(ScreenLocker); 194 DISALLOW_COPY_AND_ASSIGN(ScreenLocker);
195 }; 195 };
196 196
197 } // namespace chromeos 197 } // namespace chromeos
198 198
199 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_SCREEN_LOCKER_H_ 199 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_SCREEN_LOCKER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698