| 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 #include "chrome/browser/chromeos/mobile_config.h" | 5 #include "chrome/browser/chromeos/mobile_config.h" |
| 6 | 6 |
| 7 #include <stddef.h> |
| 8 |
| 7 #include <algorithm> | 9 #include <algorithm> |
| 8 | 10 |
| 9 #include "base/bind.h" | 11 #include "base/bind.h" |
| 10 #include "base/files/file_path.h" | 12 #include "base/files/file_path.h" |
| 11 #include "base/files/file_util.h" | 13 #include "base/files/file_util.h" |
| 12 #include "base/json/json_reader.h" | 14 #include "base/json/json_reader.h" |
| 13 #include "base/logging.h" | 15 #include "base/logging.h" |
| 14 #include "base/stl_util.h" | 16 #include "base/stl_util.h" |
| 15 #include "base/values.h" | 17 #include "base/values.h" |
| 16 #include "chrome/browser/browser_process.h" | 18 #include "chrome/browser/browser_process.h" |
| (...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 367 << local_config_file.value(); | 369 << local_config_file.value(); |
| 368 } | 370 } |
| 369 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, | 371 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, |
| 370 base::Bind(&MobileConfig::ProcessConfig, | 372 base::Bind(&MobileConfig::ProcessConfig, |
| 371 base::Unretained(this), // singleton. | 373 base::Unretained(this), // singleton. |
| 372 global_config, | 374 global_config, |
| 373 local_config)); | 375 local_config)); |
| 374 } | 376 } |
| 375 | 377 |
| 376 } // namespace chromeos | 378 } // namespace chromeos |
| OLD | NEW |