← Back to branch summary

~osomon/oxide/pa-context-app-name

« back to all changes in this revision

Viewing changes to patches/port/render_widget_host_view.patch

  • Committer: Chris Coulson
  • Date: 2015-08-21 15:16:19 UTC
  • mfrom: (640.1.348 canary)
  • Revision ID: chris.coulson@canonical.com-20150821151619-s1nzodx4pb6ai2bx
Bump Chromium rev to 46.0.2486.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/port/render_widget_host_view.patch
6
6
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
7
7
--- a/content/content_browser.gypi
8
8
+++ b/content/content_browser.gypi
9
 
@@ -1165,18 +1165,18 @@
 
9
@@ -1210,34 +1210,34 @@
 
10
       'browser/renderer_host/input/timeout_monitor.h',
 
11
       'browser/renderer_host/input/touch_action_filter.cc',
 
12
       'browser/renderer_host/input/touch_action_filter.h',
 
13
       'browser/renderer_host/input/touch_emulator.cc',
 
14
       'browser/renderer_host/input/touch_emulator.h',
 
15
       'browser/renderer_host/input/touch_emulator_client.h',
 
16
       'browser/renderer_host/input/touch_event_queue.cc',
 
17
       'browser/renderer_host/input/touch_event_queue.h',
 
18
-      'browser/renderer_host/input/touch_selection_controller_client_aura.cc',
 
19
-      'browser/renderer_host/input/touch_selection_controller_client_aura.h',
 
20
+      #'browser/renderer_host/input/touch_selection_controller_client_aura.cc',
 
21
+      #'browser/renderer_host/input/touch_selection_controller_client_aura.h',
 
22
       'browser/renderer_host/input/touchpad_tap_suppression_controller.cc',
 
23
       'browser/renderer_host/input/touchpad_tap_suppression_controller.h',
 
24
       'browser/renderer_host/input/touchscreen_tap_suppression_controller.cc',
 
25
       'browser/renderer_host/input/touchscreen_tap_suppression_controller.h',
 
26
       'browser/renderer_host/input/ui_touch_selection_helper.cc',
 
27
       'browser/renderer_host/input/ui_touch_selection_helper.h',
10
28
       'browser/renderer_host/input/web_input_event_builders_android.cc',
11
29
       'browser/renderer_host/input/web_input_event_builders_android.h',
12
30
       'browser/renderer_host/input/web_input_event_builders_win.cc',
27
45
       'browser/renderer_host/media/audio_input_sync_writer.h',
28
46
       'browser/renderer_host/media/audio_renderer_host.cc',
29
47
       'browser/renderer_host/media/audio_renderer_host.h',
30
 
@@ -1230,18 +1230,18 @@
 
48
@@ -1293,18 +1293,18 @@
31
49
       'browser/renderer_host/render_widget_helper.cc',
32
50
       'browser/renderer_host/render_widget_helper.h',
33
51
       'browser/renderer_host/render_widget_host_delegate.cc',
48
66
       'browser/renderer_host/render_widget_host_view_mac_dictionary_helper.mm',
49
67
       'browser/renderer_host/render_widget_host_view_mac_editcommand_helper.h',
50
68
       'browser/renderer_host/render_widget_host_view_mac_editcommand_helper.mm',
51
 
@@ -1456,18 +1456,18 @@
52
 
       'browser/web_contents/aura/overscroll_navigation_overlay.cc',
53
 
       'browser/web_contents/aura/overscroll_navigation_overlay.h',
54
 
       'browser/web_contents/aura/overscroll_window_animation.cc',
55
 
       'browser/web_contents/aura/overscroll_window_animation.h',
56
 
       'browser/web_contents/aura/overscroll_window_delegate.cc',
57
 
       'browser/web_contents/aura/overscroll_window_delegate.h',
58
 
       'browser/web_contents/aura/shadow_layer_delegate.cc',
59
 
       'browser/web_contents/aura/shadow_layer_delegate.h',
60
 
-      'browser/web_contents/touch_editable_impl_aura.cc',
61
 
-      'browser/web_contents/touch_editable_impl_aura.h',
62
 
+      #'browser/web_contents/touch_editable_impl_aura.cc',
63
 
+      #'browser/web_contents/touch_editable_impl_aura.h',
64
 
       'browser/web_contents/web_contents_android.cc',
65
 
       'browser/web_contents/web_contents_android.h',
66
 
       'browser/web_contents/web_contents_impl.cc',
67
 
       'browser/web_contents/web_contents_impl.h',
68
 
       'browser/web_contents/web_contents_view.h',
69
 
       'browser/web_contents/web_contents_view_android.cc',
70
 
       'browser/web_contents/web_contents_view_android.h',
71
 
       #'browser/web_contents/web_contents_view_aura.cc',
72
 
@@ -1503,16 +1503,18 @@
 
69
@@ -1572,16 +1572,18 @@
73
70
       'browser/webui/web_ui_message_handler.cc',
74
71
       'browser/zygote_host/zygote_host_impl_linux.cc',
75
72
       'browser/zygote_host/zygote_host_impl_linux.h',