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

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

Issue 2119963002: Move mus to //services/ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 5 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
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/ui/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/audio/sounds.h" 10 #include "ash/audio/sounds.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 #include "ui/gfx/transform.h" 102 #include "ui/gfx/transform.h"
103 #include "ui/keyboard/keyboard_controller.h" 103 #include "ui/keyboard/keyboard_controller.h"
104 #include "ui/keyboard/keyboard_util.h" 104 #include "ui/keyboard/keyboard_util.h"
105 #include "ui/views/focus/focus_manager.h" 105 #include "ui/views/focus/focus_manager.h"
106 #include "ui/views/widget/widget.h" 106 #include "ui/views/widget/widget.h"
107 #include "ui/views/widget/widget_delegate.h" 107 #include "ui/views/widget/widget_delegate.h"
108 #include "url/gurl.h" 108 #include "url/gurl.h"
109 109
110 #if defined(MOJO_SHELL_CLIENT) 110 #if defined(MOJO_SHELL_CLIENT)
111 #include "ash/public/interfaces/container.mojom.h" 111 #include "ash/public/interfaces/container.mojom.h"
112 #include "components/mus/public/cpp/property_type_converters.h" 112 #include "services/ui/public/cpp/property_type_converters.h"
113 #endif 113 #endif
114 114
115 namespace { 115 namespace {
116 116
117 // Maximum delay for startup sound after 'loginPromptVisible' signal. 117 // Maximum delay for startup sound after 'loginPromptVisible' signal.
118 const int kStartupSoundMaxDelayMs = 2000; 118 const int kStartupSoundMaxDelayMs = 2000;
119 119
120 // URL which corresponds to the login WebUI. 120 // URL which corresponds to the login WebUI.
121 const char kLoginURL[] = "chrome://oobe/login"; 121 const char kLoginURL[] = "chrome://oobe/login";
122 122
(...skipping 1263 matching lines...) Expand 10 before | Expand all | Expand 10 after
1386 1386
1387 locale_util::SwitchLanguageCallback callback( 1387 locale_util::SwitchLanguageCallback callback(
1388 base::Bind(&OnLanguageSwitchedCallback, base::Passed(std::move(data)))); 1388 base::Bind(&OnLanguageSwitchedCallback, base::Passed(std::move(data))));
1389 1389
1390 // Load locale keyboards here. Hardware layout would be automatically enabled. 1390 // Load locale keyboards here. Hardware layout would be automatically enabled.
1391 locale_util::SwitchLanguage(locale, true, true /* login_layouts_only */, 1391 locale_util::SwitchLanguage(locale, true, true /* login_layouts_only */,
1392 callback, ProfileManager::GetActiveUserProfile()); 1392 callback, ProfileManager::GetActiveUserProfile());
1393 } 1393 }
1394 1394
1395 } // namespace chromeos 1395 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/ui/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698