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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc

Issue 666673005: Explicitly coerce PostDispatchAction to uint32_t in DispatchEvent() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ui_enums
Patch Set: sigh. Windows. Created 6 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h" 5 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
6 6
7 #include <X11/extensions/shape.h> 7 #include <X11/extensions/shape.h>
8 #include <X11/extensions/XInput2.h> 8 #include <X11/extensions/XInput2.h>
9 #include <X11/Xatom.h> 9 #include <X11/Xatom.h>
10 #include <X11/Xregion.h> 10 #include <X11/Xregion.h>
(...skipping 1899 matching lines...) Expand 10 before | Expand all | Expand 10 after
1910 OnWMStateUpdated(); 1910 OnWMStateUpdated();
1911 else if (changed_atom == atom_cache_.GetAtom("_NET_FRAME_EXTENTS")) 1911 else if (changed_atom == atom_cache_.GetAtom("_NET_FRAME_EXTENTS"))
1912 OnFrameExtentsUpdated(); 1912 OnFrameExtentsUpdated();
1913 break; 1913 break;
1914 } 1914 }
1915 case SelectionNotify: { 1915 case SelectionNotify: {
1916 drag_drop_client_->OnSelectionNotify(xev->xselection); 1916 drag_drop_client_->OnSelectionNotify(xev->xselection);
1917 break; 1917 break;
1918 } 1918 }
1919 } 1919 }
1920 return ui::POST_DISPATCH_STOP_PROPAGATION; 1920 return ui::kPostDispatchStopPropagation;
1921 } 1921 }
1922 1922
1923 void DesktopWindowTreeHostX11::DelayedResize(const gfx::Size& size) { 1923 void DesktopWindowTreeHostX11::DelayedResize(const gfx::Size& size) {
1924 OnHostResized(size); 1924 OnHostResized(size);
1925 ResetWindowRegion(); 1925 ResetWindowRegion();
1926 delayed_resize_task_.Cancel(); 1926 delayed_resize_task_.Cancel();
1927 } 1927 }
1928 1928
1929 //////////////////////////////////////////////////////////////////////////////// 1929 ////////////////////////////////////////////////////////////////////////////////
1930 // DesktopWindowTreeHost, public: 1930 // DesktopWindowTreeHost, public:
(...skipping 12 matching lines...) Expand all
1943 if (linux_ui) { 1943 if (linux_ui) {
1944 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window); 1944 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window);
1945 if (native_theme) 1945 if (native_theme)
1946 return native_theme; 1946 return native_theme;
1947 } 1947 }
1948 1948
1949 return ui::NativeTheme::instance(); 1949 return ui::NativeTheme::instance();
1950 } 1950 }
1951 1951
1952 } // namespace views 1952 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698