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

Unified Diff: chrome/browser/chromeos/customization_document.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/cros_settings_provider.cc ('k') | chrome/browser/chromeos/locale_change_guard.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/customization_document.h
===================================================================
--- chrome/browser/chromeos/customization_document.h (revision 92173)
+++ chrome/browser/chromeos/customization_document.h (working copy)
@@ -17,13 +17,13 @@
#include "content/common/url_fetcher.h"
#include "googleurl/src/gurl.h"
-class DictionaryValue;
class FilePath;
-class ListValue;
class PrefService;
namespace base {
- class Time;
+class DictionaryValue;
+class ListValue;
+class Time;
}
namespace chromeos {
@@ -50,7 +50,7 @@
const std::string& dictionary_name,
const std::string& entry_name) const;
- scoped_ptr<DictionaryValue> root_;
+ scoped_ptr<base::DictionaryValue> root_;
private:
DISALLOW_COPY_AND_ASSIGN(CustomizationDocument);
@@ -111,7 +111,7 @@
// OEM specific carrier deal.
class CarrierDeal {
public:
- explicit CarrierDeal(DictionaryValue* deal_dict);
+ explicit CarrierDeal(base::DictionaryValue* deal_dict);
~CarrierDeal();
// Returns string with the specified |locale| and |id|.
@@ -132,7 +132,7 @@
std::string top_up_url_;
int notification_count_;
base::Time expire_date_;
- DictionaryValue* localized_strings_;
+ base::DictionaryValue* localized_strings_;
DISALLOW_COPY_AND_ASSIGN(CarrierDeal);
};
« no previous file with comments | « chrome/browser/chromeos/cros_settings_provider.cc ('k') | chrome/browser/chromeos/locale_change_guard.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698