diff options
| author | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 19:15:03 +0000 |
|---|---|---|
| committer | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 19:15:03 +0000 |
| commit | f3a1c64a4d81c412273ed567536f23c2c14813a2 (patch) | |
| tree | f0ced21805b18546e879413e4f808dd4f683c534 /chrome/browser/automation/automation_provider_observers.h | |
| parent | 2338319a9acbaecba44243740b3f01b5c408a78a (diff) | |
| download | chromium_src-f3a1c64a4d81c412273ed567536f23c2c14813a2.zip chromium_src-f3a1c64a4d81c412273ed567536f23c2c14813a2.tar.gz chromium_src-f3a1c64a4d81c412273ed567536f23c2c14813a2.tar.bz2 | |
Move base/values.h into the base namespace. This includes a cros DEPS roll
with a minor change to that code since libcros also uses base/values.h.
BUG=88666
TEST=none
Review URL: http://codereview.chromium.org/7259019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92208 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation/automation_provider_observers.h')
| -rw-r--r-- | chrome/browser/automation/automation_provider_observers.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/automation/automation_provider_observers.h b/chrome/browser/automation/automation_provider_observers.h index 9dc6d22..b513405 100644 --- a/chrome/browser/automation/automation_provider_observers.h +++ b/chrome/browser/automation/automation_provider_observers.h @@ -84,7 +84,7 @@ class InitialLoadObserver : public NotificationObserver { // stop_time_ms values may be null if WaitForInitialLoads has not finished. // Only includes entries for the |tab_count| tabs we are monitoring. // There is no defined ordering of the return value. - DictionaryValue* GetTimingInformation() const; + base::DictionaryValue* GetTimingInformation() const; private: class TabTime; @@ -1250,7 +1250,7 @@ class NTPInfoObserver : public NotificationObserver { scoped_ptr<IPC::Message> reply_message_; CancelableRequestConsumer* consumer_; CancelableRequestProvider::Handle request_; - scoped_ptr<DictionaryValue> ntp_info_; + scoped_ptr<base::DictionaryValue> ntp_info_; history::TopSites* top_sites_; NotificationRegistrar registrar_; |