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

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

Issue 1177503003: Remove the 2-level input method system & InputMethodBridge. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: reverted changes for MockInputMethod. Created 5 years, 6 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"
11 #include "ui/aura/env.h" 11 #include "ui/aura/env.h"
12 #include "ui/aura/window_event_dispatcher.h" 12 #include "ui/aura/window_event_dispatcher.h"
13 #include "ui/base/x/x11_foreign_window_manager.h" 13 #include "ui/base/x/x11_foreign_window_manager.h"
14 #include "ui/base/x/x11_menu_list.h" 14 #include "ui/base/x/x11_menu_list.h"
15 #include "ui/base/x/x11_util.h" 15 #include "ui/base/x/x11_util.h"
16 #include "ui/events/platform/platform_event_source.h" 16 #include "ui/events/platform/platform_event_source.h"
17 #include "ui/gfx/x/x11_error_tracker.h" 17 #include "ui/gfx/x/x11_error_tracker.h"
18 #include "ui/views/ime/input_method.h"
19 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h" 18 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
20 19
21 namespace { 20 namespace {
22 21
23 const char* kAtomsToCache[] = { 22 const char* kAtomsToCache[] = {
24 "_NET_ACTIVE_WINDOW", 23 "_NET_ACTIVE_WINDOW",
25 NULL 24 NULL
26 }; 25 };
27 26
28 // Our global instance. Deleted when our Env() is deleted. 27 // Our global instance. Deleted when our Env() is deleted.
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 ui::XMenuList::GetInstance()->MaybeUnregisterMenu(window); 239 ui::XMenuList::GetInstance()->MaybeUnregisterMenu(window);
241 } 240 }
242 241
243 if (event_type == DestroyNotify) { 242 if (event_type == DestroyNotify) {
244 // Notify the XForeignWindowManager that |window| has been destroyed. 243 // Notify the XForeignWindowManager that |window| has been destroyed.
245 ui::XForeignWindowManager::GetInstance()->OnWindowDestroyed(window); 244 ui::XForeignWindowManager::GetInstance()->OnWindowDestroyed(window);
246 } 245 }
247 } 246 }
248 247
249 } // namespace views 248 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698