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

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

Issue 1182523003: Removes TextInputFocusManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit per comment. Created 5 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 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 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" 5 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/audio/sounds.h" 9 #include "ash/audio/sounds.h"
10 #include "ash/desktop_background/desktop_background_controller.h" 10 #include "ash/desktop_background/desktop_background_controller.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 #include "components/user_manager/user_manager.h" 76 #include "components/user_manager/user_manager.h"
77 #include "content/public/browser/notification_service.h" 77 #include "content/public/browser/notification_service.h"
78 #include "content/public/browser/notification_types.h" 78 #include "content/public/browser/notification_types.h"
79 #include "content/public/browser/web_contents.h" 79 #include "content/public/browser/web_contents.h"
80 #include "content/public/browser/web_ui.h" 80 #include "content/public/browser/web_ui.h"
81 #include "media/audio/sounds/sounds_manager.h" 81 #include "media/audio/sounds/sounds_manager.h"
82 #include "ui/aura/window.h" 82 #include "ui/aura/window.h"
83 #include "ui/base/ime/chromeos/extension_ime_util.h" 83 #include "ui/base/ime/chromeos/extension_ime_util.h"
84 #include "ui/base/ime/chromeos/input_method_manager.h" 84 #include "ui/base/ime/chromeos/input_method_manager.h"
85 #include "ui/base/resource/resource_bundle.h" 85 #include "ui/base/resource/resource_bundle.h"
86 #include "ui/base/ui_base_switches_util.h"
87 #include "ui/compositor/layer.h" 86 #include "ui/compositor/layer.h"
88 #include "ui/compositor/layer_animation_observer.h" 87 #include "ui/compositor/layer_animation_observer.h"
89 #include "ui/compositor/scoped_layer_animation_settings.h" 88 #include "ui/compositor/scoped_layer_animation_settings.h"
90 #include "ui/events/event_utils.h" 89 #include "ui/events/event_utils.h"
91 #include "ui/gfx/display.h" 90 #include "ui/gfx/display.h"
92 #include "ui/gfx/geometry/rect.h" 91 #include "ui/gfx/geometry/rect.h"
93 #include "ui/gfx/geometry/size.h" 92 #include "ui/gfx/geometry/size.h"
94 #include "ui/gfx/screen.h" 93 #include "ui/gfx/screen.h"
95 #include "ui/gfx/transform.h" 94 #include "ui/gfx/transform.h"
96 #include "ui/keyboard/keyboard_controller.h" 95 #include "ui/keyboard/keyboard_controller.h"
(...skipping 869 matching lines...) Expand 10 before | Expand all | Expand 10 after
966 } 965 }
967 966
968 void LoginDisplayHostImpl::ShowWebUI() { 967 void LoginDisplayHostImpl::ShowWebUI() {
969 if (!login_window_ || !login_view_) { 968 if (!login_window_ || !login_view_) {
970 NOTREACHED(); 969 NOTREACHED();
971 return; 970 return;
972 } 971 }
973 VLOG(1) << "Login WebUI >> Show already initialized UI"; 972 VLOG(1) << "Login WebUI >> Show already initialized UI";
974 login_window_->Show(); 973 login_window_->Show();
975 login_view_->GetWebContents()->Focus(); 974 login_view_->GetWebContents()->Focus();
976 if (::switches::IsTextInputFocusManagerEnabled())
977 login_view_->RequestFocus();
978 login_view_->SetStatusAreaVisible(status_area_saved_visibility_); 975 login_view_->SetStatusAreaVisible(status_area_saved_visibility_);
979 login_view_->OnPostponedShow(); 976 login_view_->OnPostponedShow();
980 977
981 // We should reset this flag to allow changing of status area visibility. 978 // We should reset this flag to allow changing of status area visibility.
982 initialize_webui_hidden_ = false; 979 initialize_webui_hidden_ = false;
983 } 980 }
984 981
985 void LoginDisplayHostImpl::StartPostponedWebUI() { 982 void LoginDisplayHostImpl::StartPostponedWebUI() {
986 if (!is_wallpaper_loaded_) { 983 if (!is_wallpaper_loaded_) {
987 NOTREACHED(); 984 NOTREACHED();
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
1272 1269
1273 locale_util::SwitchLanguageCallback callback( 1270 locale_util::SwitchLanguageCallback callback(
1274 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass()))); 1271 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass())));
1275 1272
1276 // Load locale keyboards here. Hardware layout would be automatically enabled. 1273 // Load locale keyboards here. Hardware layout would be automatically enabled.
1277 locale_util::SwitchLanguage(locale, true, true /* login_layouts_only */, 1274 locale_util::SwitchLanguage(locale, true, true /* login_layouts_only */,
1278 callback, ProfileManager::GetActiveUserProfile()); 1275 callback, ProfileManager::GetActiveUserProfile());
1279 } 1276 }
1280 1277
1281 } // namespace chromeos 1278 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698