summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authordcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-15 19:35:49 +0000
committerdcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-15 19:35:49 +0000
commit8380ebeede55b13b95032dce721b5fbdc7d9cf8a (patch)
treeb0429273692eaf13eaf7bb3570927d2293907526 /content
parent99d3f1cc647ab149739a9bb2690d2c1a6a2941a4 (diff)
downloadchromium_src-8380ebeede55b13b95032dce721b5fbdc7d9cf8a.zip
chromium_src-8380ebeede55b13b95032dce721b5fbdc7d9cf8a.tar.gz
chromium_src-8380ebeede55b13b95032dce721b5fbdc7d9cf8a.tar.bz2
Remove Task inheritance from base::Timer.
BUG=none TEST=trybots TBR=brettw Review URL: http://codereview.chromium.org/8898019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114679 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/renderer_host/render_widget_host.h1
-rw-r--r--content/plugin/webplugin_proxy.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/content/browser/renderer_host/render_widget_host.h b/content/browser/renderer_host/render_widget_host.h
index 8d27e23..422beda 100644
--- a/content/browser/renderer_host/render_widget_host.h
+++ b/content/browser/renderer_host/render_widget_host.h
@@ -13,6 +13,7 @@
#include "base/callback.h"
#include "base/gtest_prod_util.h"
#include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
#include "base/process_util.h"
#include "base/property_bag.h"
#include "base/string16.h"
diff --git a/content/plugin/webplugin_proxy.h b/content/plugin/webplugin_proxy.h
index 2c44c94..33b404d 100644
--- a/content/plugin/webplugin_proxy.h
+++ b/content/plugin/webplugin_proxy.h
@@ -15,6 +15,7 @@
#endif
#include "base/memory/scoped_handle.h"
#include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
#include "base/shared_memory.h"
#include "base/timer.h"
#include "googleurl/src/gurl.h"