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

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: rebase, fix nit. 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/login/enterprise_enrollment_screen_actor.h" 14 #include "chrome/browser/chromeos/login/enterprise_enrollment_screen_actor.h"
14 #include "chrome/browser/chromeos/login/wizard_controller.h" 15 #include "chrome/browser/chromeos/login/wizard_controller.h"
15 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/ui/webui/chrome_url_data_manager.h" 17 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
17 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" 18 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
18 #include "chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h" 19 #include "chrome/browser/ui/webui/chromeos/login/core_oobe_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 "ui/base/resource/resource_bundle.h" 34 #include "ui/base/resource/resource_bundle.h"
32 35
33 namespace { 36 namespace {
34 37
35 // Path for the enterprise enrollment gaia page hosting. 38 // Path for the enterprise enrollment gaia page hosting.
36 const char kEnterpriseEnrollmentGaiaLoginPath[] = "gaialogin"; 39 const char kEnterpriseEnrollmentGaiaLoginPath[] = "gaialogin";
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 AddScreenHandler(network_screen_handler); 106 AddScreenHandler(network_screen_handler);
104 107
105 EulaScreenHandler* eula_screen_handler = new EulaScreenHandler(); 108 EulaScreenHandler* eula_screen_handler = new EulaScreenHandler();
106 eula_screen_actor_ = eula_screen_handler; 109 eula_screen_actor_ = eula_screen_handler;
107 AddScreenHandler(eula_screen_handler); 110 AddScreenHandler(eula_screen_handler);
108 111
109 UpdateScreenHandler* update_screen_handler = new UpdateScreenHandler(); 112 UpdateScreenHandler* update_screen_handler = new UpdateScreenHandler();
110 update_screen_actor_ = update_screen_handler; 113 update_screen_actor_ = update_screen_handler;
111 AddScreenHandler(update_screen_handler); 114 AddScreenHandler(update_screen_handler);
112 115
113 EnterpriseEnrollmentScreenHandler* enterprise_enrollment_screen_handler = 116 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kWebUILogin)) {
114 new EnterpriseEnrollmentScreenHandler; 117 EnterpriseOAuthEnrollmentScreenHandler*
115 enterprise_enrollment_screen_actor_ = enterprise_enrollment_screen_handler; 118 enterprise_oauth_enrollment_screen_handler =
116 AddScreenHandler(enterprise_enrollment_screen_handler); 119 new EnterpriseOAuthEnrollmentScreenHandler;
120 enterprise_enrollment_screen_actor_ =
121 enterprise_oauth_enrollment_screen_handler;
122 AddScreenHandler(enterprise_oauth_enrollment_screen_handler);
123 } else {
124 EnterpriseEnrollmentScreenHandler* enterprise_enrollment_screen_handler =
125 new EnterpriseEnrollmentScreenHandler;
126 enterprise_enrollment_screen_actor_ = enterprise_enrollment_screen_handler;
127 AddScreenHandler(enterprise_enrollment_screen_handler);
128 }
117 129
118 UserImageScreenHandler* user_image_screen_handler = 130 UserImageScreenHandler* user_image_screen_handler =
119 new UserImageScreenHandler(); 131 new UserImageScreenHandler();
120 user_image_screen_actor_ = user_image_screen_handler; 132 user_image_screen_actor_ = user_image_screen_handler;
121 AddScreenHandler(user_image_screen_handler); 133 AddScreenHandler(user_image_screen_handler);
122 134
123 signin_screen_handler_ = new SigninScreenHandler; 135 signin_screen_handler_ = new SigninScreenHandler;
124 AddScreenHandler(signin_screen_handler_); 136 AddScreenHandler(signin_screen_handler_);
125 137
126 DictionaryValue* localized_strings = new DictionaryValue(); 138 DictionaryValue* localized_strings = new DictionaryValue();
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 216
205 void OobeUI::ShowOobeUI(bool show) { 217 void OobeUI::ShowOobeUI(bool show) {
206 core_handler_->ShowOobeUI(show); 218 core_handler_->ShowOobeUI(show);
207 } 219 }
208 220
209 void OobeUI::ShowSigninScreen() { 221 void OobeUI::ShowSigninScreen() {
210 signin_screen_handler_->Show(core_handler_->show_oobe_ui()); 222 signin_screen_handler_->Show(core_handler_->show_oobe_ui());
211 } 223 }
212 224
213 } // namespace chromeos 225 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698