Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1888)

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 598603003: Use athena version of content::WebContentsViewDelegate when USE_ATHENA is defned (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/DEPS ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index e6556154ee1bca31f7a0adcc65a8c7172a3ae66b..946b5b64d7e6bc4697a1b84ff304a183e153d8d2 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -186,6 +186,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"
@@ -788,7 +789,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(
« no previous file with comments | « chrome/browser/DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698