← Back to branch summary

~saiarcot895/chromium-browser/chromium-browser.vivid.beta

« back to all changes in this revision

Viewing changes to debian/patches/3-chrome-xid.patch

  • Committer: Saikrishna Arcot
  • Date: 2015-07-09 23:11:58 UTC
  • Revision ID: saiarcot895@gmail.com-20150709231158-9j8jw1drmc55afp7
Tags: 44.0.2403.81-0ubuntu1~ppa1~vivid1
* New upstream version 44.0.2403.81
* Refreshed and updated patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/3-chrome-xid.patch
1
 
Index: beta.vivid/chrome/browser/ui/views/frame/browser_frame.cc
 
1
Index: beta.wily/chrome/browser/ui/views/frame/browser_frame.cc
2
2
===================================================================
3
 
--- beta.vivid.orig/chrome/browser/ui/views/frame/browser_frame.cc      2015-06-24 23:38:17.263565594 -0400
4
 
+++ beta.vivid/chrome/browser/ui/views/frame/browser_frame.cc   2015-06-24 23:38:17.188566715 -0400
 
3
--- beta.wily.orig/chrome/browser/ui/views/frame/browser_frame.cc       2015-07-09 18:04:37.276173565 -0400
 
4
+++ beta.wily/chrome/browser/ui/views/frame/browser_frame.cc    2015-07-09 18:04:37.269173660 -0400
5
5
@@ -27,6 +27,7 @@
6
6
 #include "ui/gfx/screen.h"
7
7
 #include "ui/views/controls/menu/menu_runner.h"
23
23
 bool BrowserFrame::UseCustomFrame() const {
24
24
   return native_browser_frame_->UseCustomFrame();
25
25
 }
26
 
Index: beta.vivid/chrome/browser/ui/views/frame/browser_frame.h
 
26
Index: beta.wily/chrome/browser/ui/views/frame/browser_frame.h
27
27
===================================================================
28
 
--- beta.vivid.orig/chrome/browser/ui/views/frame/browser_frame.h       2015-06-24 23:38:17.263565594 -0400
29
 
+++ beta.vivid/chrome/browser/ui/views/frame/browser_frame.h    2015-06-24 23:38:17.189566700 -0400
 
28
--- beta.wily.orig/chrome/browser/ui/views/frame/browser_frame.h        2015-07-09 18:04:37.276173565 -0400
 
29
+++ beta.wily/chrome/browser/ui/views/frame/browser_frame.h     2015-07-09 18:04:37.270173646 -0400
30
30
@@ -94,6 +94,8 @@
31
31
   void GetWindowPlacement(gfx::Rect* bounds,
32
32
                           ui::WindowShowState* show_state) const;
36
36
   // Overridden from views::Widget:
37
37
   views::internal::RootView* CreateRootView() override;
38
38
   views::NonClientFrameView* CreateNonClientFrameView() override;
39
 
Index: beta.vivid/chrome/browser/ui/views/frame/browser_view.cc
 
39
Index: beta.wily/chrome/browser/ui/views/frame/browser_view.cc
40
40
===================================================================
41
 
--- beta.vivid.orig/chrome/browser/ui/views/frame/browser_view.cc       2015-06-24 23:38:17.263565594 -0400
42
 
+++ beta.vivid/chrome/browser/ui/views/frame/browser_view.cc    2015-06-24 23:38:17.190566685 -0400
 
41
--- beta.wily.orig/chrome/browser/ui/views/frame/browser_view.cc        2015-07-09 18:04:37.276173565 -0400
 
42
+++ beta.wily/chrome/browser/ui/views/frame/browser_view.cc     2015-07-09 18:04:37.271173632 -0400
43
43
@@ -699,6 +699,7 @@
44
44
   force_location_bar_focus_ = false;
45
45
 
48
48
 
49
49
   chrome::MaybeShowInvertBubbleView(this);
50
50
 }
51
 
Index: beta.vivid/ui/aura/client/aura_constants.cc
 
51
Index: beta.wily/ui/aura/client/aura_constants.cc
52
52
===================================================================
53
 
--- beta.vivid.orig/ui/aura/client/aura_constants.cc    2015-06-24 23:38:17.263565594 -0400
54
 
+++ beta.vivid/ui/aura/client/aura_constants.cc 2015-06-24 23:38:17.210566385 -0400
 
53
--- beta.wily.orig/ui/aura/client/aura_constants.cc     2015-07-09 18:04:37.276173565 -0400
 
54
+++ beta.wily/ui/aura/client/aura_constants.cc  2015-07-09 18:04:37.271173632 -0400
55
55
@@ -8,6 +8,7 @@
56
56
 #include "ui/gfx/geometry/rect.h"
57
57
 
68
68
 
69
69
 }  // namespace client
70
70
 }  // namespace aura
71
 
Index: beta.vivid/ui/aura/client/aura_constants.h
 
71
Index: beta.wily/ui/aura/client/aura_constants.h
72
72
===================================================================
73
 
--- beta.vivid.orig/ui/aura/client/aura_constants.h     2015-06-24 23:38:17.263565594 -0400
74
 
+++ beta.vivid/ui/aura/client/aura_constants.h  2015-06-24 23:38:17.210566385 -0400
 
73
--- beta.wily.orig/ui/aura/client/aura_constants.h      2015-07-09 18:04:37.276173565 -0400
 
74
+++ beta.wily/ui/aura/client/aura_constants.h   2015-07-09 18:04:37.271173632 -0400
75
75
@@ -65,6 +65,9 @@
76
76
 AURA_EXPORT extern const WindowProperty<ui::WindowShowState>* const
77
77
     kShowStateKey;
82
82
 // Alphabetical sort.
83
83
 
84
84
 }  // namespace client
85
 
Index: beta.vivid/ui/aura/window_tree_host_x11.cc
 
85
Index: beta.wily/ui/aura/window_tree_host_x11.cc
86
86
===================================================================
87
 
--- beta.vivid.orig/ui/aura/window_tree_host_x11.cc     2015-06-24 23:38:17.263565594 -0400
88
 
+++ beta.vivid/ui/aura/window_tree_host_x11.cc  2015-06-24 23:38:17.227566132 -0400
 
87
--- beta.wily.orig/ui/aura/window_tree_host_x11.cc      2015-07-09 18:04:37.276173565 -0400
 
88
+++ beta.wily/ui/aura/window_tree_host_x11.cc   2015-07-09 18:04:37.271173632 -0400
89
89
@@ -456,6 +456,26 @@
90
90
   return xwindow_;
91
91
 }
113
113
 void WindowTreeHostX11::Show() {
114
114
   if (!window_mapped_) {
115
115
     // Before we map the window, set size hints. Otherwise, some window managers
116
 
Index: beta.vivid/ui/aura/window_tree_host_x11.h
 
116
Index: beta.wily/ui/aura/window_tree_host_x11.h
117
117
===================================================================
118
 
--- beta.vivid.orig/ui/aura/window_tree_host_x11.h      2015-06-24 23:38:17.263565594 -0400
119
 
+++ beta.vivid/ui/aura/window_tree_host_x11.h   2015-06-24 23:38:17.228566117 -0400
 
118
--- beta.wily.orig/ui/aura/window_tree_host_x11.h       2015-07-09 18:04:37.276173565 -0400
 
119
+++ beta.wily/ui/aura/window_tree_host_x11.h    2015-07-09 18:04:37.272173618 -0400
120
120
@@ -41,6 +41,8 @@
121
121
   bool CanDispatchEvent(const ui::PlatformEvent& event) override;
122
122
   uint32_t DispatchEvent(const ui::PlatformEvent& event) override;
126
126
   // WindowTreeHost:
127
127
   ui::EventSource* GetEventSource() override;
128
128
   gfx::AcceleratedWidget GetAcceleratedWidget() override;
129
 
Index: beta.vivid/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
 
129
Index: beta.wily/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
130
130
===================================================================
131
 
--- beta.vivid.orig/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc  2015-06-24 23:38:17.263565594 -0400
132
 
+++ beta.vivid/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc       2015-06-24 23:38:17.254565727 -0400
 
131
--- beta.wily.orig/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc   2015-07-09 18:04:37.276173565 -0400
 
132
+++ beta.wily/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc        2015-07-09 18:04:37.272173618 -0400
133
133
@@ -599,6 +599,11 @@
134
134
   drop_helper_->ResetTargetViewIfEquals(view);
135
135
 }
142
142
 void DesktopNativeWidgetAura::SetNativeWindowProperty(const char* name,
143
143
                                                       void* value) {
144
144
   if (content_window_)
145
 
Index: beta.vivid/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
 
145
Index: beta.wily/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
146
146
===================================================================
147
 
--- beta.vivid.orig/ui/views/widget/desktop_aura/desktop_native_widget_aura.h   2015-06-24 23:38:17.263565594 -0400
148
 
+++ beta.vivid/ui/views/widget/desktop_aura/desktop_native_widget_aura.h        2015-06-24 23:38:17.255565712 -0400
 
147
--- beta.wily.orig/ui/views/widget/desktop_aura/desktop_native_widget_aura.h    2015-07-09 18:04:37.276173565 -0400
 
148
+++ beta.wily/ui/views/widget/desktop_aura/desktop_native_widget_aura.h 2015-07-09 18:04:37.273173604 -0400
149
149
@@ -93,6 +93,8 @@
150
150
   // we are being activated/deactivated.
151
151
   void HandleActivationChanged(bool active);
155
155
  protected:
156
156
   // Overridden from internal::NativeWidgetPrivate:
157
157
   void InitNativeWidget(const Widget::InitParams& params) override;
158
 
Index: beta.vivid/ui/views/widget/desktop_aura/desktop_window_tree_host.h
 
158
Index: beta.wily/ui/views/widget/desktop_aura/desktop_window_tree_host.h
159
159
===================================================================
160
 
--- beta.vivid.orig/ui/views/widget/desktop_aura/desktop_window_tree_host.h     2015-06-24 23:38:17.263565594 -0400
161
 
+++ beta.vivid/ui/views/widget/desktop_aura/desktop_window_tree_host.h  2015-06-24 23:38:17.255565712 -0400
 
160
--- beta.wily.orig/ui/views/widget/desktop_aura/desktop_window_tree_host.h      2015-07-09 18:04:37.276173565 -0400
 
161
+++ beta.wily/ui/views/widget/desktop_aura/desktop_window_tree_host.h   2015-07-09 18:04:37.273173604 -0400
162
162
@@ -80,6 +80,8 @@
163
163
 
164
164
   virtual bool IsVisible() const = 0;
168
168
   virtual void SetSize(const gfx::Size& size) = 0;
169
169
   virtual void StackAtTop() = 0;
170
170
   virtual void CenterWindow(const gfx::Size& size) = 0;
171
 
Index: beta.vivid/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
 
171
Index: beta.wily/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
172
172
===================================================================
173
 
--- beta.vivid.orig/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc        2015-06-24 23:38:17.263565594 -0400
174
 
+++ beta.vivid/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc     2015-06-24 23:38:17.256565697 -0400
 
173
--- beta.wily.orig/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc 2015-07-09 18:04:37.276173565 -0400
 
174
+++ beta.wily/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc      2015-07-09 18:04:37.273173604 -0400
175
175
@@ -10,6 +10,8 @@
176
176
 #include <X11/Xregion.h>
177
177
 #include <X11/Xutil.h>
212
212
 void DesktopWindowTreeHostX11::UpdateWMUserTime(
213
213
     const ui::PlatformEvent& event) {
214
214
   if (!IsActive())
215
 
Index: beta.vivid/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
 
215
Index: beta.wily/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
216
216
===================================================================
217
 
--- beta.vivid.orig/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h 2015-06-24 23:38:17.263565594 -0400
218
 
+++ beta.vivid/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h      2015-06-24 23:38:17.257565682 -0400
 
217
--- beta.wily.orig/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h  2015-07-09 18:04:37.276173565 -0400
 
218
+++ beta.wily/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h       2015-07-09 18:04:37.273173604 -0400
219
219
@@ -86,6 +86,8 @@
220
220
   // Deallocates the internal list of open windows.
221
221
   static void CleanUpWindowList();
225
225
  protected:
226
226
   // Overridden from DesktopWindowTreeHost:
227
227
   void Init(aura::Window* content_window,
228
 
Index: beta.vivid/ui/views/widget/native_widget.h
 
228
Index: beta.wily/ui/views/widget/native_widget.h
229
229
===================================================================
230
 
--- beta.vivid.orig/ui/views/widget/native_widget.h     2015-06-24 23:38:17.263565594 -0400
231
 
+++ beta.vivid/ui/views/widget/native_widget.h  2015-06-24 23:38:17.257565682 -0400
 
230
--- beta.wily.orig/ui/views/widget/native_widget.h      2015-07-09 18:04:37.276173565 -0400
 
231
+++ beta.wily/ui/views/widget/native_widget.h   2015-07-09 18:04:37.273173604 -0400
232
232
@@ -26,6 +26,8 @@
233
233
  public:
234
234
   virtual ~NativeWidget() {}
238
238
  private:
239
239
   friend class Widget;
240
240
 
241
 
Index: beta.vivid/ui/views/widget/native_widget_aura.cc
 
241
Index: beta.wily/ui/views/widget/native_widget_aura.cc
242
242
===================================================================
243
 
--- beta.vivid.orig/ui/views/widget/native_widget_aura.cc       2015-06-24 23:38:17.263565594 -0400
244
 
+++ beta.vivid/ui/views/widget/native_widget_aura.cc    2015-06-24 23:38:17.258565667 -0400
 
243
--- beta.wily.orig/ui/views/widget/native_widget_aura.cc        2015-07-09 18:04:37.276173565 -0400
 
244
+++ beta.wily/ui/views/widget/native_widget_aura.cc     2015-07-09 18:04:37.274173591 -0400
245
245
@@ -60,6 +60,8 @@
246
246
 #include "ui/views/widget/desktop_aura/desktop_window_tree_host.h"
247
247
 #endif
263
263
 void NativeWidgetAura::GetWindowPlacement(
264
264
     gfx::Rect* bounds,
265
265
     ui::WindowShowState* show_state) const {
266
 
Index: beta.vivid/ui/views/widget/native_widget_aura.h
 
266
Index: beta.wily/ui/views/widget/native_widget_aura.h
267
267
===================================================================
268
 
--- beta.vivid.orig/ui/views/widget/native_widget_aura.h        2015-06-24 23:38:17.263565594 -0400
269
 
+++ beta.vivid/ui/views/widget/native_widget_aura.h     2015-06-24 23:38:17.259565652 -0400
 
268
--- beta.wily.orig/ui/views/widget/native_widget_aura.h 2015-07-09 18:04:37.276173565 -0400
 
269
+++ beta.wily/ui/views/widget/native_widget_aura.h      2015-07-09 18:04:37.274173591 -0400
270
270
@@ -50,6 +50,8 @@
271
271
       internal::NativeWidgetPrivate* native_widget,
272
272
       aura::Window* window);