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

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

Issue 7562008: Add new version of enrollment screen supporting OAuth. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 <string> 7 #include <string>
8 8
9 #include "base/command_line.h"
9 #include "base/logging.h" 10 #include "base/logging.h"
10 #include "base/memory/ref_counted_memory.h" 11 #include "base/memory/ref_counted_memory.h"
11 #include "base/values.h" 12 #include "base/values.h"
12 #include "chrome/browser/browser_about_handler.h" 13 #include "chrome/browser/browser_about_handler.h"
13 #include "chrome/browser/chromeos/accessibility_util.h" 14 #include "chrome/browser/chromeos/accessibility_util.h"
14 #include "chrome/browser/chromeos/login/enterprise_enrollment_screen_actor.h" 15 #include "chrome/browser/chromeos/login/enterprise_enrollment_screen_actor.h"
15 #include "chrome/browser/chromeos/login/wizard_controller.h" 16 #include "chrome/browser/chromeos/login/wizard_controller.h"
16 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/ui/webui/chrome_url_data_manager.h" 18 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
18 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" 19 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
19 #include "chrome/browser/ui/webui/chromeos/login/enterprise_enrollment_screen_ha ndler.h" 20 #include "chrome/browser/ui/webui/chromeos/login/enterprise_enrollment_screen_ha ndler.h"
21 #include "chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_scr een_handler.h"
20 #include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h" 22 #include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h"
21 #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h" 23 #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h"
22 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 24 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
23 #include "chrome/browser/ui/webui/chromeos/login/update_screen_handler.h" 25 #include "chrome/browser/ui/webui/chromeos/login/update_screen_handler.h"
24 #include "chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h" 26 #include "chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h"
25 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h" 27 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h"
26 #include "chrome/browser/ui/webui/theme_source.h" 28 #include "chrome/browser/ui/webui/theme_source.h"
29 #include "chrome/common/chrome_switches.h"
27 #include "chrome/common/jstemplate_builder.h" 30 #include "chrome/common/jstemplate_builder.h"
28 #include "chrome/common/url_constants.h" 31 #include "chrome/common/url_constants.h"
29 #include "content/browser/tab_contents/tab_contents.h" 32 #include "content/browser/tab_contents/tab_contents.h"
30 #include "grit/browser_resources.h" 33 #include "grit/browser_resources.h"
31 #include "grit/chromium_strings.h" 34 #include "grit/chromium_strings.h"
32 #include "grit/generated_resources.h" 35 #include "grit/generated_resources.h"
33 #include "ui/base/l10n/l10n_util.h" 36 #include "ui/base/l10n/l10n_util.h"
34 #include "ui/base/resource/resource_bundle.h" 37 #include "ui/base/resource/resource_bundle.h"
35 38
36 namespace { 39 namespace {
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 AddScreenHandler(network_screen_handler); 204 AddScreenHandler(network_screen_handler);
202 205
203 EulaScreenHandler* eula_screen_handler = new EulaScreenHandler(); 206 EulaScreenHandler* eula_screen_handler = new EulaScreenHandler();
204 eula_screen_actor_ = eula_screen_handler; 207 eula_screen_actor_ = eula_screen_handler;
205 AddScreenHandler(eula_screen_handler); 208 AddScreenHandler(eula_screen_handler);
206 209
207 UpdateScreenHandler* update_screen_handler = new UpdateScreenHandler(); 210 UpdateScreenHandler* update_screen_handler = new UpdateScreenHandler();
208 update_screen_actor_ = update_screen_handler; 211 update_screen_actor_ = update_screen_handler;
209 AddScreenHandler(update_screen_handler); 212 AddScreenHandler(update_screen_handler);
210 213
211 EnterpriseEnrollmentScreenHandler* enterprise_enrollment_screen_handler = 214 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kWebUIGaiaLogin)) {
212 new EnterpriseEnrollmentScreenHandler; 215 EnterpriseOAuthEnrollmentScreenHandler*
213 enterprise_enrollment_screen_actor_ = enterprise_enrollment_screen_handler; 216 enterprise_oauth_enrollment_screen_handler =
214 AddScreenHandler(enterprise_enrollment_screen_handler); 217 new EnterpriseOAuthEnrollmentScreenHandler;
218 enterprise_enrollment_screen_actor_ =
219 enterprise_oauth_enrollment_screen_handler;
220 AddScreenHandler(enterprise_oauth_enrollment_screen_handler);
221 } else {
222 EnterpriseEnrollmentScreenHandler* enterprise_enrollment_screen_handler =
223 new EnterpriseEnrollmentScreenHandler;
224 enterprise_enrollment_screen_actor_ = enterprise_enrollment_screen_handler;
225 AddScreenHandler(enterprise_enrollment_screen_handler);
226 }
215 227
216 UserImageScreenHandler* user_image_screen_handler = 228 UserImageScreenHandler* user_image_screen_handler =
217 new UserImageScreenHandler(); 229 new UserImageScreenHandler();
218 user_image_screen_actor_ = user_image_screen_handler; 230 user_image_screen_actor_ = user_image_screen_handler;
219 AddScreenHandler(user_image_screen_handler); 231 AddScreenHandler(user_image_screen_handler);
220 232
221 signin_screen_handler_ = new SigninScreenHandler; 233 signin_screen_handler_ = new SigninScreenHandler;
222 AddScreenHandler(signin_screen_handler_); 234 AddScreenHandler(signin_screen_handler_);
223 235
224 DictionaryValue* localized_strings = new DictionaryValue(); 236 DictionaryValue* localized_strings = new DictionaryValue();
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 314
303 void OobeUI::ShowOobeUI(bool show) { 315 void OobeUI::ShowOobeUI(bool show) {
304 core_handler_->ShowOobeUI(show); 316 core_handler_->ShowOobeUI(show);
305 } 317 }
306 318
307 void OobeUI::ShowSigninScreen() { 319 void OobeUI::ShowSigninScreen() {
308 signin_screen_handler_->Show(core_handler_->show_oobe_ui()); 320 signin_screen_handler_->Show(core_handler_->show_oobe_ui());
309 } 321 }
310 322
311 } // namespace chromeos 323 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698