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

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

Issue 1548153002: Switch to standard integer types in chrome/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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/installer/util/master_preferences.h" 5 #include "chrome/installer/util/master_preferences.h"
6 6
7 #include <stddef.h>
8
7 #include "base/environment.h" 9 #include "base/environment.h"
8 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
9 #include "base/json/json_string_value_serializer.h" 11 #include "base/json/json_string_value_serializer.h"
10 #include "base/lazy_instance.h" 12 #include "base/lazy_instance.h"
11 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/macros.h"
12 #include "base/strings/string_util.h" 15 #include "base/strings/string_util.h"
16 #include "build/build_config.h"
13 #include "chrome/common/env_vars.h" 17 #include "chrome/common/env_vars.h"
14 #include "chrome/common/pref_names.h" 18 #include "chrome/common/pref_names.h"
15 #include "chrome/installer/util/master_preferences_constants.h" 19 #include "chrome/installer/util/master_preferences_constants.h"
16 #include "chrome/installer/util/util_constants.h" 20 #include "chrome/installer/util/util_constants.h"
17 #include "components/variations/pref_names.h" 21 #include "components/variations/pref_names.h"
18 22
19 namespace { 23 namespace {
20 24
21 const char kFirstRunTabs[] = "first_run_tabs"; 25 const char kFirstRunTabs[] = "first_run_tabs";
22 26
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 } 309 }
306 return result; 310 return result;
307 } 311 }
308 312
309 // static 313 // static
310 const MasterPreferences& MasterPreferences::ForCurrentProcess() { 314 const MasterPreferences& MasterPreferences::ForCurrentProcess() {
311 return g_master_preferences.Get(); 315 return g_master_preferences.Get();
312 } 316 }
313 317
314 } // namespace installer 318 } // namespace installer
OLDNEW
« no previous file with comments | « chrome/installer/util/master_preferences.h ('k') | chrome/installer/util/master_preferences_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698