From 295d0f471e76fdef581d50f2893f4ba28380bd76 Mon Sep 17 00:00:00 2001
From: pkotwicz <pkotwicz@chromium.org>
Date: Tue, 23 Sep 2014 20:15:13 -0700
Subject: [PATCH] Use athena version of content::WebContentsViewDelegate when
 USE_ATHENA is defned

BUG=414781, 416859
TEST=Manual, see bug

Review URL: https://codereview.chromium.org/598603003

Cr-Commit-Position: refs/heads/master@{#296336}
---
 chrome/browser/DEPS                             | 1 +
 chrome/browser/chrome_content_browser_client.cc | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS
index 32798dd6d039..a753ad6e1486 100644
--- a/chrome/browser/DEPS
+++ b/chrome/browser/DEPS
@@ -1,6 +1,7 @@
 include_rules = [
   "+apps",
   "+ash",
+  "+athena/content/public",
   "+chrome/app",
   "+chrome/grit",  # For generated headers
   "+chrome/installer",
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index fb37d86bc2c6..7df193708404 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -191,6 +191,7 @@
 #endif
 
 #if defined(USE_ATHENA)
+#include "athena/content/public/web_contents_view_delegate_creator.h"
 #include "chrome/browser/ui/views/athena/chrome_browser_main_extra_parts_athena.h"
 #elif defined(USE_ASH)
 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h"
@@ -793,7 +794,11 @@ void ChromeContentBrowserClient::GetStoragePartitionConfigForSite(
 content::WebContentsViewDelegate*
     ChromeContentBrowserClient::GetWebContentsViewDelegate(
         content::WebContents* web_contents) {
+#if defined(USE_ATHENA)
+  return athena::CreateWebContentsViewDelegate(web_contents);
+#else
   return chrome::CreateWebContentsViewDelegate(web_contents);
+#endif
 }
 
 void ChromeContentBrowserClient::RenderProcessWillLaunch(
-- 
2.11.4.GIT