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

Side by Side Diff: chrome/browser/chromeos/login/startup_utils.cc

Issue 1095843003: [cros] Modify oobe/login tests to work with webview (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: disable blocking test Created 5 years, 8 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/chromeos/login/startup_utils.h" 5 #include "chrome/browser/chromeos/login/startup_utils.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 policy_manager 197 policy_manager
198 ? policy_manager->IsRemoraRequisition() || 198 ? policy_manager->IsRemoraRequisition() ||
199 policy_manager->IsSharkRequisition() 199 policy_manager->IsSharkRequisition()
200 : false; 200 : false;
201 201
202 bool is_webview_disabled_pref = g_browser_process->local_state()->GetBoolean( 202 bool is_webview_disabled_pref = g_browser_process->local_state()->GetBoolean(
203 prefs::kWebviewSigninDisabled); 203 prefs::kWebviewSigninDisabled);
204 204
205 // TODO(dzhioev): Re-enable webview signin for remora/shark requisition 205 // TODO(dzhioev): Re-enable webview signin for remora/shark requisition
206 // http://crbug.com/464049 206 // http://crbug.com/464049
207 LOG(ERROR) << ">>>>>>>>>>> webview enabled "
Dmitry Polukhin 2015/04/22 06:47:07 Debug prints?
Nikita (slow) 2015/04/22 09:01:45 Done.
208 << (!is_remora_or_shark_requisition && IsWebviewSigninAllowed() &&
209 !is_webview_disabled_pref);
207 return !is_remora_or_shark_requisition && IsWebviewSigninAllowed() && 210 return !is_remora_or_shark_requisition && IsWebviewSigninAllowed() &&
208 !is_webview_disabled_pref; 211 !is_webview_disabled_pref;
209 } 212 }
210 213
211 // static 214 // static
212 bool StartupUtils::EnableWebviewSignin(bool is_enabled) { 215 bool StartupUtils::EnableWebviewSignin(bool is_enabled) {
213 if (is_enabled && !IsWebviewSigninAllowed()) 216 if (is_enabled && !IsWebviewSigninAllowed())
214 return false; 217 return false;
215 218
216 g_browser_process->local_state()->SetBoolean(prefs::kWebviewSigninDisabled, 219 g_browser_process->local_state()->SetBoolean(prefs::kWebviewSigninDisabled,
(...skipping 14 matching lines...) Expand all
231 return extensions::GetCurrentChannel() <= chrome::VersionInfo::CHANNEL_DEV; 234 return extensions::GetCurrentChannel() <= chrome::VersionInfo::CHANNEL_DEV;
232 } 235 }
233 236
234 // static 237 // static
235 bool StartupUtils::IsNewOobeActivated() { 238 bool StartupUtils::IsNewOobeActivated() {
236 return g_browser_process->local_state()->GetBoolean(prefs::kNewOobe) && 239 return g_browser_process->local_state()->GetBoolean(prefs::kNewOobe) &&
237 IsNewOobeAllowed(); 240 IsNewOobeAllowed();
238 } 241 }
239 242
240 } // namespace chromeos 243 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698