summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/page_info_model.cc2
-rw-r--r--chrome/browser/page_info_model.h1
-rw-r--r--chrome/browser/renderer_host/test/test_render_view_host.cc4
-rw-r--r--chrome/browser/renderer_host/test/test_render_view_host.h4
4 files changed, 8 insertions, 3 deletions
diff --git a/chrome/browser/page_info_model.cc b/chrome/browser/page_info_model.cc
index b8ce79a..a605db8 100644
--- a/chrome/browser/page_info_model.cc
+++ b/chrome/browser/page_info_model.cc
@@ -276,6 +276,8 @@ PageInfoModel::PageInfoModel(Profile* profile,
}
}
+PageInfoModel::~PageInfoModel() {}
+
int PageInfoModel::GetSectionCount() {
return sections_.size();
}
diff --git a/chrome/browser/page_info_model.h b/chrome/browser/page_info_model.h
index 9490385..3dda092 100644
--- a/chrome/browser/page_info_model.h
+++ b/chrome/browser/page_info_model.h
@@ -82,6 +82,7 @@ class PageInfoModel {
const NavigationEntry::SSLStatus& ssl,
bool show_history,
PageInfoModelObserver* observer);
+ ~PageInfoModel();
int GetSectionCount();
SectionInfo GetSectionInfo(int index);
diff --git a/chrome/browser/renderer_host/test/test_render_view_host.cc b/chrome/browser/renderer_host/test/test_render_view_host.cc
index a711ff7..4dd0722 100644
--- a/chrome/browser/renderer_host/test/test_render_view_host.cc
+++ b/chrome/browser/renderer_host/test/test_render_view_host.cc
@@ -229,6 +229,10 @@ void TestRenderWidgetHostView::ShowCompositorHostWindow(bool show) {
}
#endif
+gfx::PluginWindowHandle TestRenderWidgetHostView::AcquireCompositingSurface() {
+ return gfx::kNullPluginWindow;
+}
+
bool TestRenderWidgetHostView::ContainsNativeView(
gfx::NativeView native_view) const {
return false;
diff --git a/chrome/browser/renderer_host/test/test_render_view_host.h b/chrome/browser/renderer_host/test/test_render_view_host.h
index 78afa0e..eefbc780 100644
--- a/chrome/browser/renderer_host/test/test_render_view_host.h
+++ b/chrome/browser/renderer_host/test/test_render_view_host.h
@@ -139,9 +139,7 @@ class TestRenderWidgetHostView : public RenderWidgetHostView {
virtual void AcceleratedCompositingActivated(bool activated) { }
#endif
- virtual gfx::PluginWindowHandle AcquireCompositingSurface() {
- return gfx::kNullPluginWindow;
- }
+ virtual gfx::PluginWindowHandle AcquireCompositingSurface();
virtual void ReleaseCompositingSurface(gfx::PluginWindowHandle surface) { }
virtual bool ContainsNativeView(gfx::NativeView native_view) const;