| OLD | NEW |
| 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 // This file defines dummy implementation of several functions from the | 5 // This file defines dummy implementation of several functions from the |
| 6 // master_preferences namespace for Google Chrome. These functions allow 64-bit | 6 // master_preferences namespace for Google Chrome. These functions allow 64-bit |
| 7 // Windows Chrome binary to build successfully. Since this binary is only used | 7 // Windows Chrome binary to build successfully. Since this binary is only used |
| 8 // for Native Client support which uses the 32 bit installer, most of the | 8 // for Native Client support which uses the 32 bit installer, most of the |
| 9 // master preferences functionality is not actually needed. | 9 // master preferences functionality is not actually needed. |
| 10 | 10 |
| 11 #include "chrome/installer/util/master_preferences.h" | 11 #include "chrome/installer/util/master_preferences.h" |
| 12 | 12 |
| 13 #include <windows.h> | |
| 14 | |
| 15 #include "base/logging.h" | 13 #include "base/logging.h" |
| 16 #include "base/values.h" | 14 #include "base/values.h" |
| 17 #include "url/gurl.h" | |
| 18 | 15 |
| 19 namespace installer { | 16 namespace installer { |
| 20 | 17 |
| 21 MasterPreferences::MasterPreferences(const CommandLine& cmd_line) | 18 MasterPreferences::MasterPreferences(const CommandLine& cmd_line) |
| 22 : distribution_(NULL), preferences_read_from_file_(false) { | 19 : distribution_(NULL), preferences_read_from_file_(false) { |
| 23 } | 20 } |
| 24 | 21 |
| 25 MasterPreferences::MasterPreferences(const base::FilePath& prefs_path) | 22 MasterPreferences::MasterPreferences(const base::FilePath& prefs_path) |
| 26 : distribution_(NULL), preferences_read_from_file_(false) { | 23 : distribution_(NULL), preferences_read_from_file_(false) { |
| 27 } | 24 } |
| (...skipping 22 matching lines...) Expand all Loading... |
| 50 return std::vector<std::string>(); | 47 return std::vector<std::string>(); |
| 51 } | 48 } |
| 52 | 49 |
| 53 // static | 50 // static |
| 54 const MasterPreferences& MasterPreferences::ForCurrentProcess() { | 51 const MasterPreferences& MasterPreferences::ForCurrentProcess() { |
| 55 static MasterPreferences prefs(*CommandLine::ForCurrentProcess()); | 52 static MasterPreferences prefs(*CommandLine::ForCurrentProcess()); |
| 56 return prefs; | 53 return prefs; |
| 57 } | 54 } |
| 58 | 55 |
| 59 } // namespace installer | 56 } // namespace installer |
| OLD | NEW |