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

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

Issue 2919583002: chromeos: Move InputMethodUtil into //ui/base/ime/chromeos (Closed)
Patch Set: Created 3 years, 6 months 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/gaia_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
6 6
7 #include "ash/system/devicetype_utils.h" 7 #include "ash/system/devicetype_utils.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/guid.h" 10 #include "base/guid.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/metrics/histogram_macros.h" 12 #include "base/metrics/histogram_macros.h"
13 #include "base/stl_util.h" 13 #include "base/stl_util.h"
14 #include "base/strings/utf_string_conversions.h" 14 #include "base/strings/utf_string_conversions.h"
15 #include "base/task_scheduler/post_task.h" 15 #include "base/task_scheduler/post_task.h"
16 #include "base/values.h" 16 #include "base/values.h"
17 #include "chrome/browser/browser_process.h" 17 #include "chrome/browser/browser_process.h"
18 #include "chrome/browser/browser_shutdown.h" 18 #include "chrome/browser/browser_shutdown.h"
19 #include "chrome/browser/chromeos/input_method/input_method_util.h"
20 #include "chrome/browser/chromeos/language_preferences.h" 19 #include "chrome/browser/chromeos/language_preferences.h"
21 #include "chrome/browser/chromeos/login/screens/network_error.h" 20 #include "chrome/browser/chromeos/login/screens/network_error.h"
22 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" 21 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
23 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" 22 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
24 #include "chrome/browser/chromeos/net/network_portal_detector_impl.h" 23 #include "chrome/browser/chromeos/net/network_portal_detector_impl.h"
25 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 24 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
26 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h" 25 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
27 #include "chrome/browser/chromeos/profiles/profile_helper.h" 26 #include "chrome/browser/chromeos/profiles/profile_helper.h"
28 #include "chrome/browser/chromeos/settings/cros_settings.h" 27 #include "chrome/browser/chromeos/settings/cros_settings.h"
29 #include "chrome/browser/io_thread.h" 28 #include "chrome/browser/io_thread.h"
(...skipping 13 matching lines...) Expand all
43 #include "components/prefs/pref_service.h" 42 #include "components/prefs/pref_service.h"
44 #include "components/strings/grit/components_strings.h" 43 #include "components/strings/grit/components_strings.h"
45 #include "components/user_manager/known_user.h" 44 #include "components/user_manager/known_user.h"
46 #include "components/user_manager/user_manager.h" 45 #include "components/user_manager/user_manager.h"
47 #include "components/version_info/version_info.h" 46 #include "components/version_info/version_info.h"
48 #include "content/public/browser/browser_thread.h" 47 #include "content/public/browser/browser_thread.h"
49 #include "content/public/browser/render_frame_host.h" 48 #include "content/public/browser/render_frame_host.h"
50 #include "google_apis/gaia/gaia_auth_util.h" 49 #include "google_apis/gaia/gaia_auth_util.h"
51 #include "google_apis/gaia/gaia_urls.h" 50 #include "google_apis/gaia/gaia_urls.h"
52 #include "ui/base/ime/chromeos/input_method_manager.h" 51 #include "ui/base/ime/chromeos/input_method_manager.h"
52 #include "ui/base/ime/chromeos/input_method_util.h"
53 53
54 using content::BrowserThread; 54 using content::BrowserThread;
55 namespace em = enterprise_management; 55 namespace em = enterprise_management;
56 56
57 namespace chromeos { 57 namespace chromeos {
58 58
59 namespace { 59 namespace {
60 60
61 const char kJsScreenPath[] = "login.GaiaSigninScreen"; 61 const char kJsScreenPath[] = "login.GaiaSigninScreen";
62 const char kAuthIframeParentName[] = "signin-frame"; 62 const char kAuthIframeParentName[] = "signin-frame";
(...skipping 911 matching lines...) Expand 10 before | Expand all | Expand 10 after
974 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() { 974 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() {
975 return signin_screen_handler_->delegate_; 975 return signin_screen_handler_->delegate_;
976 } 976 }
977 977
978 bool GaiaScreenHandler::IsRestrictiveProxy() const { 978 bool GaiaScreenHandler::IsRestrictiveProxy() const {
979 return !disable_restrictive_proxy_check_for_test_ && 979 return !disable_restrictive_proxy_check_for_test_ &&
980 !IsOnline(captive_portal_status_); 980 !IsOnline(captive_portal_status_);
981 } 981 }
982 982
983 } // namespace chromeos 983 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.cc ('k') | chrome/browser/ui/webui/chromeos/login/l10n_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698