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

Side by Side Diff: ui/views/widget/desktop_root_window_host_linux.cc

Issue 11312055: Fix another typo. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_root_window_host_linux.h" 5 #include "ui/views/widget/desktop_root_window_host_linux.h"
6 6
7 #include <X11/extensions/XInput2.h> 7 #include <X11/extensions/XInput2.h>
8 #include <X11/Xatom.h> 8 #include <X11/Xatom.h>
9 #include <X11/Xutil.h> 9 #include <X11/Xutil.h>
10 10
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 current_cursor_(ui::kCursorNull), 83 current_cursor_(ui::kCursorNull),
84 native_widget_delegate_(native_widget_delegate), 84 native_widget_delegate_(native_widget_delegate),
85 desktop_native_widget_aura_(desktop_native_widget_aura) { 85 desktop_native_widget_aura_(desktop_native_widget_aura) {
86 } 86 }
87 87
88 DesktopRootWindowHostLinux::~DesktopRootWindowHostLinux() { 88 DesktopRootWindowHostLinux::~DesktopRootWindowHostLinux() {
89 } 89 }
90 90
91 // static 91 // static
92 ui::NativeTheme* DesktopRootWindowHost::GetNativeTheme(aura::Window* window) { 92 ui::NativeTheme* DesktopRootWindowHost::GetNativeTheme(aura::Window* window) {
93 return NativeTheme::instance(); 93 return ui::NativeTheme::instance();
94 } 94 }
95 95
96 //////////////////////////////////////////////////////////////////////////////// 96 ////////////////////////////////////////////////////////////////////////////////
97 // DesktopRootWindowHostLinux, private: 97 // DesktopRootWindowHostLinux, private:
98 98
99 void DesktopRootWindowHostLinux::InitX11Window( 99 void DesktopRootWindowHostLinux::InitX11Window(
100 const Widget::InitParams& params) { 100 const Widget::InitParams& params) {
101 unsigned long attribute_mask = CWBackPixmap; 101 unsigned long attribute_mask = CWBackPixmap;
102 XSetWindowAttributes swa; 102 XSetWindowAttributes swa;
103 memset(&swa, 0, sizeof(swa)); 103 memset(&swa, 0, sizeof(swa));
(...skipping 972 matching lines...) Expand 10 before | Expand all | Expand 10 after
1076 DesktopRootWindowHost* DesktopRootWindowHost::Create( 1076 DesktopRootWindowHost* DesktopRootWindowHost::Create(
1077 internal::NativeWidgetDelegate* native_widget_delegate, 1077 internal::NativeWidgetDelegate* native_widget_delegate,
1078 DesktopNativeWidgetAura* desktop_native_widget_aura, 1078 DesktopNativeWidgetAura* desktop_native_widget_aura,
1079 const gfx::Rect& initial_bounds) { 1079 const gfx::Rect& initial_bounds) {
1080 return new DesktopRootWindowHostLinux(native_widget_delegate, 1080 return new DesktopRootWindowHostLinux(native_widget_delegate,
1081 desktop_native_widget_aura, 1081 desktop_native_widget_aura,
1082 initial_bounds); 1082 initial_bounds);
1083 } 1083 }
1084 1084
1085 } // namespace views 1085 } // namespace views
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698