chrome/installer/util/eula_util.cc - Issue 497083004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/, part 2.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/installer/util/eula_util.cc

Issue 497083004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/, part 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@file_util

Patch Set: 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

« no previous file with comments | « chrome/installer/util/duplicate_tree_detector_unittest.cc ('k') | chrome/installer/util/google_update_util.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 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/installer/util/eula_util.h"	5 #include "chrome/installer/util/eula_util.h"

6	6

7 #include "base/file_util.h"	7 #include "base/files/file_util.h"

8 #include "base/memory/scoped_ptr.h"	8 #include "base/memory/scoped_ptr.h"

9 #include "chrome/installer/util/browser_distribution.h"	9 #include "chrome/installer/util/browser_distribution.h"

10 #include "chrome/installer/util/install_util.h"	10 #include "chrome/installer/util/install_util.h"

11 #include "chrome/installer/util/installation_state.h"	11 #include "chrome/installer/util/installation_state.h"

12 #include "chrome/installer/util/master_preferences.h"	12 #include "chrome/installer/util/master_preferences.h"

13 #include "chrome/installer/util/master_preferences_constants.h"	13 #include "chrome/installer/util/master_preferences_constants.h"

14	14

15 namespace installer {	15 namespace installer {

16	16

17 namespace {	17 namespace {

(...skipping 68 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
86	86

87 bool eula_required = false;	87 bool eula_required = false;

88 // If kRequireEula value is absent, assume EULA is not required.	88 // If kRequireEula value is absent, assume EULA is not required.

89 if (!install_prefs->GetBool(master_preferences::kRequireEula, &eula_required))	89 if (!install_prefs->GetBool(master_preferences::kRequireEula, &eula_required))

90 return QUERY_EULA_ACCEPTED;	90 return QUERY_EULA_ACCEPTED;

91	91

92 return eula_required ? QUERY_EULA_NOT_ACCEPTED : QUERY_EULA_ACCEPTED;	92 return eula_required ? QUERY_EULA_NOT_ACCEPTED : QUERY_EULA_ACCEPTED;

93 }	93 }

94	94

95 } // namespace installer	95 } // namespace installer

OLD	NEW