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

Side by Side Diff: chrome/browser/chromeos/mobile_config.h

Issue 8538002: Cleanup: Remove unneeded forward declarations from chrome/browser/chromeos. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix a small nit Created 9 years, 1 month 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 #ifndef CHROME_BROWSER_CHROMEOS_MOBILE_CONFIG_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_MOBILE_CONFIG_H_
6 #define CHROME_BROWSER_CHROMEOS_MOBILE_CONFIG_H_ 6 #define CHROME_BROWSER_CHROMEOS_MOBILE_CONFIG_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/gtest_prod_util.h" 13 #include "base/gtest_prod_util.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/memory/singleton.h" 15 #include "base/memory/singleton.h"
16 #include "base/time.h" 16 #include "base/time.h"
17 #include "chrome/browser/chromeos/customization_document.h" 17 #include "chrome/browser/chromeos/customization_document.h"
18 18
19 class FilePath; 19 class FilePath;
20 20
21 namespace base { 21 namespace base {
22 class DictionaryValue; 22 class DictionaryValue;
23 class ListValue;
24 } 23 }
25 24
26 namespace chromeos { 25 namespace chromeos {
27 26
28 // Class that processes mobile (carrier) configuration. 27 // Class that processes mobile (carrier) configuration.
29 // Confugration is defined as a JSON file - global and local one. 28 // Confugration is defined as a JSON file - global and local one.
30 // First global configuration is loaded then local one if it exists. 29 // First global configuration is loaded then local one if it exists.
31 // Notes on global/local configuration: 30 // Notes on global/local configuration:
32 // 1. All global config data is inherited unless some carrier properties 31 // 1. All global config data is inherited unless some carrier properties
33 // are overidden or carrier deals are explicitly marked as excluded. 32 // are overidden or carrier deals are explicitly marked as excluded.
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 // Root value of the local config (if it exists). 159 // Root value of the local config (if it exists).
161 // Global config is stored in root_ of the base class. 160 // Global config is stored in root_ of the base class.
162 scoped_ptr<base::DictionaryValue> local_config_root_; 161 scoped_ptr<base::DictionaryValue> local_config_root_;
163 162
164 DISALLOW_COPY_AND_ASSIGN(MobileConfig); 163 DISALLOW_COPY_AND_ASSIGN(MobileConfig);
165 }; 164 };
166 165
167 } // namespace chromeos 166 } // namespace chromeos
168 167
169 #endif // CHROME_BROWSER_CHROMEOS_MOBILE_CONFIG_H_ 168 #endif // CHROME_BROWSER_CHROMEOS_MOBILE_CONFIG_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.h ('k') | chrome/browser/chromeos/notifications/balloon_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698