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

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

Issue 2920253003: kiosk: Tighten cert manager UI (Closed)
Patch Set: Created 3 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/app_launch_controller.h" 5 #include "chrome/browser/chromeos/login/app_launch_controller.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/json/json_file_value_serializer.h" 10 #include "base/json/json_file_value_serializer.h"
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 return can_configure_network_callback_->Run(); 354 return can_configure_network_callback_->Run();
355 355
356 if (IsEnterpriseManaged()) { 356 if (IsEnterpriseManaged()) {
357 bool should_prompt; 357 bool should_prompt;
358 if (CrosSettings::Get()->GetBoolean( 358 if (CrosSettings::Get()->GetBoolean(
359 kAccountsPrefDeviceLocalAccountPromptForNetworkWhenOffline, 359 kAccountsPrefDeviceLocalAccountPromptForNetworkWhenOffline,
360 &should_prompt)) { 360 &should_prompt)) {
361 return should_prompt; 361 return should_prompt;
362 } 362 }
363 363
364 // Default to true to allow network configuration if the policy is missing. 364 // Default to false to allow network configuration if the policy is missing.
tbarzic 2017/06/06 19:02:42 nit: can you update the comment :) E.g. Network co
xiyuan 2017/06/08 19:13:57 Done.
365 return true; 365 return false;
366 } 366 }
367 367
368 return user_manager::UserManager::Get()->GetOwnerAccountId().is_valid(); 368 return user_manager::UserManager::Get()->GetOwnerAccountId().is_valid();
369 } 369 }
370 370
371 bool AppLaunchController::NeedOwnerAuthToConfigureNetwork() { 371 bool AppLaunchController::NeedOwnerAuthToConfigureNetwork() {
372 if (need_owner_auth_to_configure_network_callback_) 372 if (need_owner_auth_to_configure_network_callback_)
373 return need_owner_auth_to_configure_network_callback_->Run(); 373 return need_owner_auth_to_configure_network_callback_->Run();
374 374
375 return !IsEnterpriseManaged(); 375 return !IsEnterpriseManaged();
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 KioskAppLaunchError::Save(error); 512 KioskAppLaunchError::Save(error);
513 chrome::AttemptUserExit(); 513 chrome::AttemptUserExit();
514 CleanUp(); 514 CleanUp();
515 } 515 }
516 516
517 bool AppLaunchController::IsShowingNetworkConfigScreen() { 517 bool AppLaunchController::IsShowingNetworkConfigScreen() {
518 return network_config_requested_; 518 return network_config_requested_;
519 } 519 }
520 520
521 } // namespace chromeos 521 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698