diff options
| -rw-r--r-- | chrome/chrome_browser.gypi | 3 | ||||
| -rw-r--r-- | content/browser/renderer_host/render_widget_host_view.cc | 2 | ||||
| -rw-r--r-- | ui/base/dragdrop/os_exchange_data_provider_aura.cc | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 7e5ca2d..16077ef 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -4183,6 +4183,7 @@ ['exclude', '^browser/google/google_update.h'], ['exclude', '^browser/hang_monitor/'], ['exclude', '^browser/platform_util_win.cc'], + ['exclude', '^browser/renderer_host/render_widget_host_view_views*'], ['exclude', '^browser/tab_contents/web_drag_source_win.cc'], ['exclude', '^browser/tab_contents/web_drag_source_win.h'], ['exclude', '^browser/ui/panels/auto_hiding_desktop_bar_win.cc'], @@ -4215,8 +4216,10 @@ ['include', '^browser/ui/views/simple_message_box_views.h'], ['exclude', '^browser/ui/views/simple_message_box_win.cc'], ['exclude', '^browser/ui/views/ssl_client_certificate_selector.cc'], + ['exclude', '^browser/ui/views/tab_contents/native_tab_contents_container_views*'], ['exclude', '^browser/ui/views/tab_contents/native_tab_contents_container_win.cc'], ['exclude', '^browser/ui/views/tab_contents/native_tab_contents_container_win.h'], + ['exclude', '^browser/ui/views/tab_contents/native_tab_contents_view_views*'], ['exclude', '^browser/ui/views/tab_contents/native_tab_contents_view_win.cc'], ['exclude', '^browser/ui/views/tab_contents/native_tab_contents_view_win.h'], ['exclude', '^browser/ui/views/tab_contents/tab_contents_drag_win.cc'], diff --git a/content/browser/renderer_host/render_widget_host_view.cc b/content/browser/renderer_host/render_widget_host_view.cc index 6b08a9d..9943e94 100644 --- a/content/browser/renderer_host/render_widget_host_view.cc +++ b/content/browser/renderer_host/render_widget_host_view.cc @@ -14,7 +14,7 @@ #include "content/browser/renderer_host/gtk_window_utils.h" #endif -#if defined(TOUCH_UI) +#if defined(TOUCH_UI) && !defined(USE_AURA) // static void RenderWidgetHostView::GetDefaultScreenInfo( WebKit::WebScreenInfo* results) { diff --git a/ui/base/dragdrop/os_exchange_data_provider_aura.cc b/ui/base/dragdrop/os_exchange_data_provider_aura.cc index 18b4128..349b89f 100644 --- a/ui/base/dragdrop/os_exchange_data_provider_aura.cc +++ b/ui/base/dragdrop/os_exchange_data_provider_aura.cc @@ -69,7 +69,8 @@ OSExchangeData::Provider* OSExchangeData::CreateProvider() { } // static -void* OSExchangeData::RegisterCustomFormat(const std::string& type) { +OSExchangeData::CustomFormat +OSExchangeData::RegisterCustomFormat(const std::string& type) { // TODO(davemoore) Implement this for aura. return NULL; } |