summaryrefslogtreecommitdiffstats
path: root/ui/views/views_delegate.cc
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-19 18:06:39 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-19 18:06:39 +0000
commit7c1913843901b5fd273c82ae33a126f4f648fb4e (patch)
tree0321feec2d4443327320f00cf587e09832a77344 /ui/views/views_delegate.cc
parent960b0378ebc8c18bfa13f8c24bb1070d641ba74b (diff)
downloadchromium_src-7c1913843901b5fd273c82ae33a126f4f648fb4e.zip
chromium_src-7c1913843901b5fd273c82ae33a126f4f648fb4e.tar.gz
chromium_src-7c1913843901b5fd273c82ae33a126f4f648fb4e.tar.bz2
Adds ViewsDelegate::GetContextFactory
This is needed to provide a ContextFactory to the Compositor so that we can create Compositors on multiple threads. BUG=none TEST=none R=ben@chromium.org Review URL: https://codereview.chromium.org/284233009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271422 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/views_delegate.cc')
-rw-r--r--ui/views/views_delegate.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/ui/views/views_delegate.cc b/ui/views/views_delegate.cc
index bef6cdc..c1c7ca6 100644
--- a/ui/views/views_delegate.cc
+++ b/ui/views/views_delegate.cc
@@ -81,6 +81,12 @@ bool ViewsDelegate::WindowManagerProvidesTitleBar(bool maximized) {
return false;
}
+#if defined(USE_AURA)
+ui::ContextFactory* ViewsDelegate::GetContextFactory() {
+ return NULL;
+}
+#endif
+
#if defined(OS_WIN)
int ViewsDelegate::GetAppbarAutohideEdges(HMONITOR monitor,
const base::Closure& callback) {