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

Side by Side Diff: chrome/browser/chromeos/policy/enterprise_install_attributes.cc

Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bad merge Created 6 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) 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/policy/enterprise_install_attributes.h" 5 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/file_util.h" 10 #include "base/files/file_util.h"
11 #include "base/location.h" 11 #include "base/location.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/message_loop/message_loop.h" 13 #include "base/message_loop/message_loop.h"
14 #include "chrome/browser/chromeos/policy/proto/install_attributes.pb.h" 14 #include "chrome/browser/chromeos/policy/proto/install_attributes.pb.h"
15 #include "chromeos/cryptohome/cryptohome_util.h" 15 #include "chromeos/cryptohome/cryptohome_util.h"
16 #include "chromeos/dbus/dbus_thread_manager.h" 16 #include "chromeos/dbus/dbus_thread_manager.h"
17 #include "google_apis/gaia/gaia_auth_util.h" 17 #include "google_apis/gaia/gaia_auth_util.h"
18 18
19 namespace policy { 19 namespace policy {
20 20
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 &consumer_kiosk_enabled) && 387 &consumer_kiosk_enabled) &&
388 consumer_kiosk_enabled == "true") { 388 consumer_kiosk_enabled == "true") {
389 registration_mode_ = DEVICE_MODE_CONSUMER_KIOSK_AUTOLAUNCH; 389 registration_mode_ = DEVICE_MODE_CONSUMER_KIOSK_AUTOLAUNCH;
390 } else if (enterprise_user.empty() && enterprise_owned != "true") { 390 } else if (enterprise_user.empty() && enterprise_owned != "true") {
391 // |registration_user_| is empty on consumer devices. 391 // |registration_user_| is empty on consumer devices.
392 registration_mode_ = DEVICE_MODE_CONSUMER; 392 registration_mode_ = DEVICE_MODE_CONSUMER;
393 } 393 }
394 } 394 }
395 395
396 } // namespace policy 396 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698