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/ui/webui/chromeos/login/signin_screen_handler.cc

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 3 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 | Annotate | Revision Log
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 "base/bind.h" 10 #include "base/bind.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 #include "chrome/browser/io_thread.h" 47 #include "chrome/browser/io_thread.h"
48 #include "chrome/browser/profiles/profile.h" 48 #include "chrome/browser/profiles/profile.h"
49 #include "chrome/browser/ui/webui/chromeos/login/authenticated_user_email_retrie ver.h" 49 #include "chrome/browser/ui/webui/chromeos/login/authenticated_user_email_retrie ver.h"
50 #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h" 50 #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h"
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"
58 #include "chrome/grit/generated_resources.h"
57 #include "chromeos/dbus/dbus_thread_manager.h" 59 #include "chromeos/dbus/dbus_thread_manager.h"
58 #include "chromeos/dbus/power_manager_client.h" 60 #include "chromeos/dbus/power_manager_client.h"
59 #include "chromeos/ime/ime_keyboard.h" 61 #include "chromeos/ime/ime_keyboard.h"
60 #include "chromeos/ime/input_method_descriptor.h" 62 #include "chromeos/ime/input_method_descriptor.h"
61 #include "chromeos/ime/input_method_manager.h" 63 #include "chromeos/ime/input_method_manager.h"
62 #include "chromeos/login/auth/key.h" 64 #include "chromeos/login/auth/key.h"
63 #include "chromeos/login/auth/user_context.h" 65 #include "chromeos/login/auth/user_context.h"
64 #include "chromeos/network/network_state.h" 66 #include "chromeos/network/network_state.h"
65 #include "chromeos/network/network_state_handler.h" 67 #include "chromeos/network/network_state_handler.h"
66 #include "chromeos/network/portal_detector/network_portal_detector.h" 68 #include "chromeos/network/portal_detector/network_portal_detector.h"
67 #include "components/user_manager/user.h" 69 #include "components/user_manager/user.h"
68 #include "components/user_manager/user_manager.h" 70 #include "components/user_manager/user_manager.h"
69 #include "components/user_manager/user_type.h" 71 #include "components/user_manager/user_type.h"
70 #include "content/public/browser/render_frame_host.h" 72 #include "content/public/browser/render_frame_host.h"
71 #include "content/public/browser/web_contents.h" 73 #include "content/public/browser/web_contents.h"
72 #include "google_apis/gaia/gaia_auth_util.h" 74 #include "google_apis/gaia/gaia_auth_util.h"
73 #include "grit/chromium_strings.h"
74 #include "grit/generated_resources.h"
75 #include "net/url_request/url_request_context_getter.h" 75 #include "net/url_request/url_request_context_getter.h"
76 #include "third_party/cros_system_api/dbus/service_constants.h" 76 #include "third_party/cros_system_api/dbus/service_constants.h"
77 #include "ui/base/webui/web_ui_util.h" 77 #include "ui/base/webui/web_ui_util.h"
78 78
79 #if defined(USE_AURA) 79 #if defined(USE_AURA)
80 #include "ash/shell.h" 80 #include "ash/shell.h"
81 #include "ash/wm/lock_state_controller.h" 81 #include "ash/wm/lock_state_controller.h"
82 #endif 82 #endif
83 83
84 namespace { 84 namespace {
(...skipping 1401 matching lines...) Expand 10 before | Expand all | Expand 10 after
1486 return gaia_screen_handler_->frame_error(); 1486 return gaia_screen_handler_->frame_error();
1487 } 1487 }
1488 1488
1489 void SigninScreenHandler::OnCapsLockChanged(bool enabled) { 1489 void SigninScreenHandler::OnCapsLockChanged(bool enabled) {
1490 caps_lock_enabled_ = enabled; 1490 caps_lock_enabled_ = enabled;
1491 if (page_is_ready()) 1491 if (page_is_ready())
1492 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_); 1492 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_);
1493 } 1493 }
1494 1494
1495 } // namespace chromeos 1495 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698