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

Side by Side Diff: ui/views/widget/desktop_aura/x11_desktop_handler.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/x11_desktop_handler.h" 5 #include "ui/views/widget/desktop_aura/x11_desktop_handler.h"
6 6
7 #include <X11/Xatom.h> 7 #include <X11/Xatom.h>
8 #include <X11/Xlib.h> 8 #include <X11/Xlib.h>
9 9
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 case CreateNotify: 175 case CreateNotify:
176 OnWindowCreatedOrDestroyed(event->type, event->xcreatewindow.window); 176 OnWindowCreatedOrDestroyed(event->type, event->xcreatewindow.window);
177 break; 177 break;
178 case DestroyNotify: 178 case DestroyNotify:
179 OnWindowCreatedOrDestroyed(event->type, event->xdestroywindow.window); 179 OnWindowCreatedOrDestroyed(event->type, event->xdestroywindow.window);
180 break; 180 break;
181 default: 181 default:
182 NOTREACHED(); 182 NOTREACHED();
183 } 183 }
184 184
185 return ui::POST_DISPATCH_NONE; 185 return ui::kPostDispatchNone;
186 } 186 }
187 187
188 void X11DesktopHandler::OnWindowInitialized(aura::Window* window) { 188 void X11DesktopHandler::OnWindowInitialized(aura::Window* window) {
189 } 189 }
190 190
191 void X11DesktopHandler::OnWillDestroyEnv() { 191 void X11DesktopHandler::OnWillDestroyEnv() {
192 g_handler = NULL; 192 g_handler = NULL;
193 delete this; 193 delete this;
194 } 194 }
195 195
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 ui::XMenuList::GetInstance()->MaybeUnregisterMenu(window); 235 ui::XMenuList::GetInstance()->MaybeUnregisterMenu(window);
236 } 236 }
237 237
238 if (event_type == DestroyNotify) { 238 if (event_type == DestroyNotify) {
239 // Notify the XForeignWindowManager that |window| has been destroyed. 239 // Notify the XForeignWindowManager that |window| has been destroyed.
240 ui::XForeignWindowManager::GetInstance()->OnWindowDestroyed(window); 240 ui::XForeignWindowManager::GetInstance()->OnWindowDestroyed(window);
241 } 241 }
242 } 242 }
243 243
244 } // namespace views 244 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698