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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 9757001: Support custom drag-and-drop of bookmarks in Aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Minor style fixes from CR Created 8 years, 9 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 | « no previous file | chrome/browser/tab_contents/chrome_web_contents_view_delegate_aura.h » ('j') | 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 02bf9050769e90747df1db096173b2bda5be60c1..76de2316615e11e70554fe75e7c8a6a46b0b08d2 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -108,7 +108,9 @@
#include "chrome/browser/chrome_browser_main_posix.h"
#endif
-#if defined(OS_WIN) && !defined(USE_AURA)
+#if defined(USE_AURA)
+#include "chrome/browser/tab_contents/chrome_web_contents_view_delegate_aura.h"
+#elif defined(OS_WIN)
#include "chrome/browser/tab_contents/chrome_web_contents_view_delegate_win.h"
#endif
@@ -360,7 +362,8 @@ content::WebContentsView*
ChromeContentBrowserClient::OverrideCreateWebContentsView(
WebContents* web_contents) {
#if defined(TOOLKIT_VIEWS)
- return new TabContentsViewViews(web_contents);
+ return new TabContentsViewViews(web_contents,
+ GetWebContentsViewDelegate(web_contents));
#endif
return NULL;
}
@@ -376,6 +379,8 @@ content::WebContentsViewDelegate*
return
chrome_web_contents_view_delegate_mac::CreateWebContentsViewDelegateMac(
web_contents);
+#elif defined(USE_AURA)
+ return new ChromeWebContentsViewDelegateAura(web_contents);
#else
return NULL;
#endif
« no previous file with comments | « no previous file | chrome/browser/tab_contents/chrome_web_contents_view_delegate_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698