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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h" 51 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h"
52 #include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h" 52 #include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h"
53 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h" 53 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"
54 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 54 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
55 #include "chrome/common/pref_names.h" 55 #include "chrome/common/pref_names.h"
56 #include "chrome/common/url_constants.h" 56 #include "chrome/common/url_constants.h"
57 #include "chrome/grit/chromium_strings.h" 57 #include "chrome/grit/chromium_strings.h"
58 #include "chrome/grit/generated_resources.h" 58 #include "chrome/grit/generated_resources.h"
59 #include "chromeos/dbus/dbus_thread_manager.h" 59 #include "chromeos/dbus/dbus_thread_manager.h"
60 #include "chromeos/dbus/power_manager_client.h" 60 #include "chromeos/dbus/power_manager_client.h"
61 #include "chromeos/ime/ime_keyboard.h"
62 #include "chromeos/ime/input_method_descriptor.h"
63 #include "chromeos/ime/input_method_manager.h"
61 #include "chromeos/login/auth/key.h" 64 #include "chromeos/login/auth/key.h"
62 #include "chromeos/login/auth/user_context.h" 65 #include "chromeos/login/auth/user_context.h"
63 #include "chromeos/network/network_state.h" 66 #include "chromeos/network/network_state.h"
64 #include "chromeos/network/network_state_handler.h" 67 #include "chromeos/network/network_state_handler.h"
65 #include "chromeos/network/portal_detector/network_portal_detector.h" 68 #include "chromeos/network/portal_detector/network_portal_detector.h"
66 #include "components/user_manager/user.h" 69 #include "components/user_manager/user.h"
67 #include "components/user_manager/user_manager.h" 70 #include "components/user_manager/user_manager.h"
68 #include "components/user_manager/user_type.h" 71 #include "components/user_manager/user_type.h"
69 #include "content/public/browser/render_frame_host.h" 72 #include "content/public/browser/render_frame_host.h"
70 #include "content/public/browser/web_contents.h" 73 #include "content/public/browser/web_contents.h"
71 #include "google_apis/gaia/gaia_auth_util.h" 74 #include "google_apis/gaia/gaia_auth_util.h"
72 #include "third_party/cros_system_api/dbus/service_constants.h" 75 #include "third_party/cros_system_api/dbus/service_constants.h"
73 #include "ui/base/ime/chromeos/ime_keyboard.h"
74 #include "ui/base/ime/chromeos/input_method_descriptor.h"
75 #include "ui/base/ime/chromeos/input_method_manager.h"
76 #include "ui/base/webui/web_ui_util.h" 76 #include "ui/base/webui/web_ui_util.h"
77 77
78 #if !defined(USE_ATHENA) 78 #if !defined(USE_ATHENA)
79 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" 79 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
80 #endif 80 #endif
81 81
82 namespace { 82 namespace {
83 83
84 // Max number of users to show. 84 // Max number of users to show.
85 const size_t kMaxUsers = 18; 85 const size_t kMaxUsers = 18;
(...skipping 1515 matching lines...) Expand 10 before | Expand all | Expand 10 after
1601 return gaia_screen_handler_->frame_error(); 1601 return gaia_screen_handler_->frame_error();
1602 } 1602 }
1603 1603
1604 void SigninScreenHandler::OnCapsLockChanged(bool enabled) { 1604 void SigninScreenHandler::OnCapsLockChanged(bool enabled) {
1605 caps_lock_enabled_ = enabled; 1605 caps_lock_enabled_ = enabled;
1606 if (page_is_ready()) 1606 if (page_is_ready())
1607 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_); 1607 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_);
1608 } 1608 }
1609 1609
1610 } // namespace chromeos 1610 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698