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

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

Issue 2027683003: Pin keyboard moved to under the user profile. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Created 4 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/oobe_ui.h" 5 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <memory> 9 #include <memory>
10 10
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 source->AddResourcePath(kLockJSPath, IDR_LOCK_JS); 135 source->AddResourcePath(kLockJSPath, IDR_LOCK_JS);
136 source->AddResourcePath(kCustomElementsHTMLPath, 136 source->AddResourcePath(kCustomElementsHTMLPath,
137 IDR_CUSTOM_ELEMENTS_LOCK_HTML); 137 IDR_CUSTOM_ELEMENTS_LOCK_HTML);
138 source->AddResourcePath(kCustomElementsJSPath, IDR_CUSTOM_ELEMENTS_LOCK_JS); 138 source->AddResourcePath(kCustomElementsJSPath, IDR_CUSTOM_ELEMENTS_LOCK_JS);
139 source->AddResourcePath(kCustomElementsPinKeyboardHTMLPath, 139 source->AddResourcePath(kCustomElementsPinKeyboardHTMLPath,
140 IDR_CUSTOM_ELEMENTS_PIN_KEYBOARD_HTML); 140 IDR_CUSTOM_ELEMENTS_PIN_KEYBOARD_HTML);
141 source->AddResourcePath(kCustomElementsPinKeyboardJSPath, 141 source->AddResourcePath(kCustomElementsPinKeyboardJSPath,
142 IDR_CUSTOM_ELEMENTS_PIN_KEYBOARD_JS); 142 IDR_CUSTOM_ELEMENTS_PIN_KEYBOARD_JS);
143 143
144 // TODO(jdufault): Dynamically show pin when it is enabled. 144 // TODO(jdufault): Dynamically show pin when it is enabled.
145 source->AddBoolean(kShowPinKey, false); 145 source->AddBoolean(kShowPinKey, true);
jdufault 2016/05/31 19:24:51 We don't want to show the keyboard by default, so
146 } else { 146 } else {
147 source->SetDefaultResource(IDR_LOGIN_HTML); 147 source->SetDefaultResource(IDR_LOGIN_HTML);
148 source->AddResourcePath(kLoginJSPath, IDR_LOGIN_JS); 148 source->AddResourcePath(kLoginJSPath, IDR_LOGIN_JS);
149 source->AddResourcePath(kCustomElementsHTMLPath, 149 source->AddResourcePath(kCustomElementsHTMLPath,
150 IDR_CUSTOM_ELEMENTS_LOGIN_HTML); 150 IDR_CUSTOM_ELEMENTS_LOGIN_HTML);
151 source->AddResourcePath(kCustomElementsJSPath, 151 source->AddResourcePath(kCustomElementsJSPath,
152 IDR_CUSTOM_ELEMENTS_LOGIN_JS); 152 IDR_CUSTOM_ELEMENTS_LOGIN_JS);
153 } 153 }
154 source->AddResourcePath(kKeyboardUtilsJSPath, IDR_KEYBOARD_UTILS_JS); 154 source->AddResourcePath(kKeyboardUtilsJSPath, IDR_KEYBOARD_UTILS_JS);
155 source->OverrideContentSecurityPolicyFrameSrc( 155 source->OverrideContentSecurityPolicyFrameSrc(
(...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after
607 NOTIMPLEMENTED(); 607 NOTIMPLEMENTED();
608 } 608 }
609 609
610 FOR_EACH_OBSERVER(Observer, 610 FOR_EACH_OBSERVER(Observer,
611 observer_list_, 611 observer_list_,
612 OnCurrentScreenChanged(current_screen_, new_screen)); 612 OnCurrentScreenChanged(current_screen_, new_screen));
613 current_screen_ = new_screen; 613 current_screen_ = new_screen;
614 } 614 }
615 615
616 } // namespace chromeos 616 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698