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

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

Issue 1543173002: Switch to standard integer types in ui/views/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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/Xatom.h> 7 #include <X11/Xatom.h>
8 #include <X11/Xregion.h> 8 #include <X11/Xregion.h>
9 #include <X11/Xutil.h> 9 #include <X11/Xutil.h>
10 #include <X11/extensions/XInput2.h> 10 #include <X11/extensions/XInput2.h>
11 #include <X11/extensions/shape.h> 11 #include <X11/extensions/shape.h>
12 #include <utility> 12 #include <utility>
13 13
14 #include "base/basictypes.h"
15 #include "base/command_line.h" 14 #include "base/command_line.h"
16 #include "base/strings/stringprintf.h" 15 #include "base/strings/stringprintf.h"
17 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
18 #include "base/trace_event/trace_event.h" 17 #include "base/trace_event/trace_event.h"
19 #include "third_party/skia/include/core/SkPath.h" 18 #include "third_party/skia/include/core/SkPath.h"
20 #include "ui/aura/client/cursor_client.h" 19 #include "ui/aura/client/cursor_client.h"
21 #include "ui/aura/client/focus_client.h" 20 #include "ui/aura/client/focus_client.h"
22 #include "ui/aura/window.h" 21 #include "ui/aura/window.h"
23 #include "ui/aura/window_event_dispatcher.h" 22 #include "ui/aura/window_event_dispatcher.h"
24 #include "ui/aura/window_property.h" 23 #include "ui/aura/window_property.h"
(...skipping 2030 matching lines...) Expand 10 before | Expand all | Expand 10 after
2055 if (linux_ui) { 2054 if (linux_ui) {
2056 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window); 2055 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window);
2057 if (native_theme) 2056 if (native_theme)
2058 return native_theme; 2057 return native_theme;
2059 } 2058 }
2060 2059
2061 return ui::NativeThemeAura::instance(); 2060 return ui::NativeThemeAura::instance();
2062 } 2061 }
2063 2062
2064 } // namespace views 2063 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698