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

Side by Side Diff: chrome/installer/util/master_preferences.h

Issue 7259019: Move base/values.h into the base namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 5 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 // This file contains functions processing master preference file used by 5 // This file contains functions processing master preference file used by
6 // setup and first run. 6 // setup and first run.
7 7
8 #ifndef CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_H_ 8 #ifndef CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_H_
9 #define CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_H_ 9 #define CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_H_
10 #pragma once 10 #pragma once
11 11
12 #include <string> 12 #include <string>
13 #include <vector> 13 #include <vector>
14 14
15 #include "base/command_line.h" 15 #include "base/command_line.h"
16 #include "base/memory/scoped_ptr.h" 16 #include "base/memory/scoped_ptr.h"
17 #include "googleurl/src/gurl.h" 17 #include "googleurl/src/gurl.h"
18 18
19 class FilePath;
20
21 namespace base {
19 class DictionaryValue; 22 class DictionaryValue;
20 class FilePath; 23 }
24
25 using base::DictionaryValue;
21 26
22 namespace installer { 27 namespace installer {
23 28
24 // This is the default name for the master preferences file used to pre-set 29 // This is the default name for the master preferences file used to pre-set
25 // values in the user profile at first run. 30 // values in the user profile at first run.
26 const char kDefaultMasterPrefs[] = "master_preferences"; 31 const char kDefaultMasterPrefs[] = "master_preferences";
27 32
28 // The master preferences is a JSON file with the same entries as the 33 // The master preferences is a JSON file with the same entries as the
29 // 'Default\Preferences' file. This function parses the distribution 34 // 'Default\Preferences' file. This function parses the distribution
30 // section of the preferences file. 35 // section of the preferences file.
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 bool chrome_frame_; 197 bool chrome_frame_;
193 bool multi_install_; 198 bool multi_install_;
194 199
195 private: 200 private:
196 DISALLOW_COPY_AND_ASSIGN(MasterPreferences); 201 DISALLOW_COPY_AND_ASSIGN(MasterPreferences);
197 }; 202 };
198 203
199 } // namespace installer 204 } // namespace installer
200 205
201 #endif // CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_H_ 206 #endif // CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698