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

Unified Diff: chrome/browser/ui/views/chrome_views_delegate.cc

Issue 10083057: Revert 132856 - Aura/ash split: Remove hacks and get chrome linking without ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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/ui/views/chrome_views_delegate.h ('k') | chrome/browser/ui/views/color_chooser_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/chrome_views_delegate.cc
===================================================================
--- chrome/browser/ui/views/chrome_views_delegate.cc (revision 132861)
+++ chrome/browser/ui/views/chrome_views_delegate.cc (working copy)
@@ -26,8 +26,6 @@
#if defined(USE_ASH)
#include "ash/shell.h"
-#elif defined(USE_AURA)
-#include "ui/views/widget/desktop_native_widget_helper_aura.h"
#endif
namespace {
@@ -159,14 +157,3 @@
int ChromeViewsDelegate::GetDispositionForEvent(int event_flags) {
return event_utils::DispositionFromEventFlags(event_flags);
}
-
-#if defined(USE_AURA)
-views::NativeWidgetHelperAura* ChromeViewsDelegate::CreateNativeWidgetHelper(
- views::NativeWidgetAura* native_widget) {
-#if !defined(USE_ASH)
- return new views::DesktopNativeWidgetHelperAura(native_widget);
-#else
- return NULL;
-#endif
-}
-#endif
« no previous file with comments | « chrome/browser/ui/views/chrome_views_delegate.h ('k') | chrome/browser/ui/views/color_chooser_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698