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

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

Issue 2865003003: Put OOBE UI on touch display if no keyboard detected (Closed)
Patch Set: Address most (all?) code comments up to #7 Created 3 years, 7 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 <utility> 7 #include <utility>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/public/cpp/shell_window_ids.h" 10 #include "ash/public/cpp/shell_window_ids.h"
(...skipping 957 matching lines...) Expand 10 before | Expand all | Expand 10 after
968 // LoginDisplayHostImpl, chromeos::CrasAudioHandler::AudioObserver: 968 // LoginDisplayHostImpl, chromeos::CrasAudioHandler::AudioObserver:
969 969
970 void LoginDisplayHostImpl::OnActiveOutputNodeChanged() { 970 void LoginDisplayHostImpl::OnActiveOutputNodeChanged() {
971 TryToPlayStartupSound(); 971 TryToPlayStartupSound();
972 } 972 }
973 973
974 //////////////////////////////////////////////////////////////////////////////// 974 ////////////////////////////////////////////////////////////////////////////////
975 // LoginDisplayHostImpl, display::DisplayObserver: 975 // LoginDisplayHostImpl, display::DisplayObserver:
976 976
977 void LoginDisplayHostImpl::OnDisplayAdded(const display::Display& new_display) { 977 void LoginDisplayHostImpl::OnDisplayAdded(const display::Display& new_display) {
978 if (GetOobeUI())
979 GetOobeUI()->OnDisplayAdded();
978 } 980 }
oshima 2017/05/10 00:14:31 I think you need to handle removed case. - You h
Felix Ekblom 2017/05/10 10:59:13 Addressed in Patch set 3 by triggering a re-evalua
979 981
980 void LoginDisplayHostImpl::OnDisplayRemoved( 982 void LoginDisplayHostImpl::OnDisplayRemoved(
981 const display::Display& old_display) {} 983 const display::Display& old_display) {}
982 984
983 void LoginDisplayHostImpl::OnDisplayMetricsChanged( 985 void LoginDisplayHostImpl::OnDisplayMetricsChanged(
984 const display::Display& display, 986 const display::Display& display,
985 uint32_t changed_metrics) { 987 uint32_t changed_metrics) {
986 display::Display primary_display = 988 display::Display primary_display =
987 display::Screen::GetScreen()->GetPrimaryDisplay(); 989 display::Screen::GetScreen()->GetPrimaryDisplay();
988 if (display.id() != primary_display.id() || 990 if (display.id() != primary_display.id() ||
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after
1389 // Chrome locale. Otherwise it will be lost if Chrome restarts. 1391 // Chrome locale. Otherwise it will be lost if Chrome restarts.
1390 // Don't need to schedule pref save because setting initial local 1392 // Don't need to schedule pref save because setting initial local
1391 // will enforce preference saving. 1393 // will enforce preference saving.
1392 prefs->SetString(prefs::kApplicationLocale, locale); 1394 prefs->SetString(prefs::kApplicationLocale, locale);
1393 StartupUtils::SetInitialLocale(locale); 1395 StartupUtils::SetInitialLocale(locale);
1394 1396
1395 TriggerShowLoginWizardFinish(locale, std::move(data)); 1397 TriggerShowLoginWizardFinish(locale, std::move(data));
1396 } 1398 }
1397 1399
1398 } // namespace chromeos 1400 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698