← Back to branch summary

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

« back to all changes in this revision

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

  • Committer: Saikrishna Arcot
  • Date: 2016-02-06 15:25:06 UTC
  • Revision ID: saikrishna@saikrishna-vps-20160206152506-gowpdzcmv12ssxzm
Tags: 50.0.2638.0-0ubuntu1~ppa1~15.04.1
* New upstream version 50.0.2638.0
* Updated patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/3-chrome-xid.patch
2
2
===================================================================
3
3
--- dev.wily.orig/chrome/browser/ui/views/frame/browser_frame.cc
4
4
+++ dev.wily/chrome/browser/ui/views/frame/browser_frame.cc
5
 
@@ -30,6 +30,7 @@
 
5
@@ -29,6 +29,7 @@
6
6
 #include "ui/gfx/screen.h"
7
7
 #include "ui/views/controls/menu/menu_runner.h"
8
8
 #include "ui/views/widget/native_widget.h"
10
10
 
11
11
 #if defined(OS_CHROMEOS)
12
12
 #include "ash/session/session_state_delegate.h"
13
 
@@ -140,6 +141,12 @@ views::View* BrowserFrame::GetFrameView(
 
13
@@ -127,6 +128,12 @@ views::View* BrowserFrame::GetFrameView(
14
14
   return browser_frame_view_;
15
15
 }
16
16
 
40
40
===================================================================
41
41
--- dev.wily.orig/chrome/browser/ui/views/frame/browser_view.cc
42
42
+++ dev.wily/chrome/browser/ui/views/frame/browser_view.cc
43
 
@@ -733,6 +733,7 @@ void BrowserView::Show() {
 
43
@@ -739,6 +739,7 @@ void BrowserView::Show() {
44
44
   force_location_bar_focus_ = false;
45
45
 
46
46
   browser()->OnWindowDidShow();
56
56
 #include "ui/gfx/geometry/rect.h"
57
57
 
58
58
 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, bool)
59
 
+DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, uint32)
 
59
+DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, uint32_t)
60
60
 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::ModalType)
61
61
 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, gfx::Rect*)
62
62
 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::InputMethod*)
64
64
     ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT);
65
65
 DEFINE_WINDOW_PROPERTY_KEY(
66
66
     ui::WindowShowState, kShowStateKey, ui::SHOW_STATE_DEFAULT);
67
 
+DEFINE_WINDOW_PROPERTY_KEY(uint32, kSessionIdKey, 0);
 
67
+DEFINE_WINDOW_PROPERTY_KEY(uint32_t, kSessionIdKey, 0);
68
68
 
69
69
 }  // namespace client
70
70
 }  // namespace aura
76
76
 AURA_EXPORT extern const WindowProperty<ui::WindowShowState>* const
77
77
     kShowStateKey;
78
78
 
79
 
+AURA_EXPORT extern const WindowProperty<uint32>* const kSessionIdKey;
 
79
+AURA_EXPORT extern const WindowProperty<uint32_t>* const kSessionIdKey;
80
80
+
81
81
+
82
82
 // Alphabetical sort.
90
90
   bool CanDispatchEvent(const ui::PlatformEvent& event) override;
91
91
   uint32_t DispatchEvent(const ui::PlatformEvent& event) override;
92
92
 
93
 
+//  void SetSessionID(uint32 s) OVERRIDE;
 
93
+//  void SetSessionID(uint32_t s) OVERRIDE;
94
94
+
95
95
   // WindowTreeHost:
96
96
   ui::EventSource* GetEventSource() override;
99
99
===================================================================
100
100
--- dev.wily.orig/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
101
101
+++ dev.wily/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
102
 
@@ -602,6 +602,11 @@ void DesktopNativeWidgetAura::ViewRemove
 
102
@@ -592,6 +592,11 @@ void DesktopNativeWidgetAura::ViewRemove
103
103
   drop_helper_->ResetTargetViewIfEquals(view);
104
104
 }
105
105
 
115
115
===================================================================
116
116
--- dev.wily.orig/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
117
117
+++ dev.wily/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
118
 
@@ -88,6 +88,8 @@ class VIEWS_EXPORT DesktopNativeWidgetAu
 
118
@@ -87,6 +87,8 @@ class VIEWS_EXPORT DesktopNativeWidgetAu
119
119
   // we are being activated/deactivated.
120
120
   void HandleActivationChanged(bool active);
121
121
 
122
 
+  void SetSessionID(uint32 sessionid);
 
122
+  void SetSessionID(uint32_t sessionid);
123
123
+
124
124
  protected:
125
125
   // Overridden from internal::NativeWidgetPrivate:
132
132
 
133
133
   virtual bool IsVisible() const = 0;
134
134
 
135
 
+  virtual void SetSessionID(uint32 sessionid) = 0;
 
135
+  virtual void SetSessionID(uint32_t sessionid) = 0;
136
136
+
137
137
   virtual void SetSize(const gfx::Size& size) = 0;
138
138
   virtual void StackAbove(aura::Window* window) = 0;
162
162
   XSetWMNormalHints(xdisplay_, xwindow_, &hints);
163
163
 }
164
164
 
165
 
+void DesktopWindowTreeHostX11::SetSessionID(uint32 session_id) {
 
165
+void DesktopWindowTreeHostX11::SetSessionID(uint32_t session_id) {
166
166
+  if (session_id != 0) {
167
167
+    XChangeProperty(xdisplay_,
168
168
+                    xwindow_,
189
189
   // internal list of open windows.
190
190
   static void CleanUpWindowList(void (*func)(aura::Window* window));
191
191
 
192
 
+  void SetSessionID(uint32 sessionid);
 
192
+  void SetSessionID(uint32_t sessionid);
193
193
+
194
194
  protected:
195
195
   // Overridden from DesktopWindowTreeHost:
202
202
  public:
203
203
   virtual ~NativeWidget() {}
204
204
 
205
 
+  virtual void SetSessionID(uint32 sessionid) = 0;
 
205
+  virtual void SetSessionID(uint32_t sessionid) = 0;
206
206
+
207
207
  private:
208
208
   friend class Widget;
224
224
   window_->SetBounds(window_bounds);
225
225
 }
226
226
 
227
 
+void NativeWidgetAura::SetSessionID(uint32 sessionid) {
 
227
+void NativeWidgetAura::SetSessionID(uint32_t sessionid) {
228
228
+  VLOG(1) << "I have no idea.";
229
229
+  raise(SIGABRT);
230
230
+}
240
240
       internal::NativeWidgetPrivate* native_widget,
241
241
       aura::Window* window);
242
242
 
243
 
+  virtual void SetSessionID(uint32 sessionid) override;
 
243
+  virtual void SetSessionID(uint32_t sessionid) override;
244
244
+
245
245
   // Overridden from internal::NativeWidgetPrivate:
246
246
   void InitNativeWidget(const Widget::InitParams& params) override;