diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-15 17:23:23 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-15 17:23:23 +0000 |
| commit | 5097dc8cf47eb60b3284db2ccf3c1e645c6d8b7b (patch) | |
| tree | 4df72d2d3125b017df6fd3286d331a5fcd8498a4 /chrome/common | |
| parent | 7f041050fd817116b78aa09227f511cc6505d7f3 (diff) | |
| download | chromium_src-5097dc8cf47eb60b3284db2ccf3c1e645c6d8b7b.zip chromium_src-5097dc8cf47eb60b3284db2ccf3c1e645c6d8b7b.tar.gz chromium_src-5097dc8cf47eb60b3284db2ccf3c1e645c6d8b7b.tar.bz2 | |
Attempt four at landing the "histogram.h removed from message_loop.h" patch.
Previously committed as r52349 and r52336. Related commits: r52367, r52364
and r52343.
Rerunning trybots due to previous trybot breakage.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/2965015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52496 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/desktop_notifications/active_notification_tracker.cc | 1 | ||||
| -rw-r--r-- | chrome/common/net/gaia/gaia_authenticator2.h | 1 | ||||
| -rw-r--r-- | chrome/common/process_watcher_win.cc | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/chrome/common/desktop_notifications/active_notification_tracker.cc b/chrome/common/desktop_notifications/active_notification_tracker.cc index 0bfff59..9822711 100644 --- a/chrome/common/desktop_notifications/active_notification_tracker.cc +++ b/chrome/common/desktop_notifications/active_notification_tracker.cc @@ -5,6 +5,7 @@ #include "chrome/common/desktop_notifications/active_notification_tracker.h" #include "base/message_loop.h" +#include "base/scoped_ptr.h" #include "third_party/WebKit/WebKit/chromium/public/WebNotification.h" #include "third_party/WebKit/WebKit/chromium/public/WebNotificationPermissionCallback.h" diff --git a/chrome/common/net/gaia/gaia_authenticator2.h b/chrome/common/net/gaia/gaia_authenticator2.h index ac44efa..0e6c203c 100644 --- a/chrome/common/net/gaia/gaia_authenticator2.h +++ b/chrome/common/net/gaia/gaia_authenticator2.h @@ -8,6 +8,7 @@ #include <string> #include "base/gtest_prod_util.h" +#include "base/scoped_ptr.h" #include "chrome/common/net/gaia/gaia_auth_consumer.h" #include "chrome/common/net/url_fetcher.h" #include "googleurl/src/gurl.h" diff --git a/chrome/common/process_watcher_win.cc b/chrome/common/process_watcher_win.cc index 2b4e9d8..ed99780 100644 --- a/chrome/common/process_watcher_win.cc +++ b/chrome/common/process_watcher_win.cc @@ -4,6 +4,7 @@ #include "chrome/common/process_watcher.h" +#include "base/scoped_ptr.h" #include "base/env_var.h" #include "base/message_loop.h" #include "base/object_watcher.h" |