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

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

Issue 10795024: ui: Forward declare DefaultSingletonTraits in header files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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 | Annotate | Revision Log
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/x11_desktop_handler.h" 5 #include "ui/views/widget/x11_desktop_handler.h"
6 6
7 #include "ui/views/widget/desktop_native_widget_helper_aura.h" 7 #include "base/message_loop.h"
8 #include "ui/aura/desktop/desktop_activation_client.h" 8 #include "ui/aura/desktop/desktop_activation_client.h"
9 #include "ui/aura/dispatcher_linux.h" 9 #include "ui/aura/dispatcher_linux.h"
10 #include "ui/aura/env.h" 10 #include "ui/aura/env.h"
11 #include "ui/aura/focus_manager.h" 11 #include "ui/aura/focus_manager.h"
12 #include "ui/aura/root_window.h" 12 #include "ui/aura/root_window.h"
13 #include "ui/base/x/x11_util.h" 13 #include "ui/base/x/x11_util.h"
14 #include "ui/views/widget/desktop_native_widget_helper_aura.h"
14 15
15 namespace { 16 namespace {
16 17
17 const char* kAtomsToCache[] = { 18 const char* kAtomsToCache[] = {
18 "_NET_ACTIVE_WINDOW", 19 "_NET_ACTIVE_WINDOW",
19 NULL 20 NULL
20 }; 21 };
21 22
22 // Our global instance. Deleted when our Env() is deleted. 23 // Our global instance. Deleted when our Env() is deleted.
23 views::X11DesktopHandler* g_handler = NULL; 24 views::X11DesktopHandler* g_handler = NULL;
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 aura::RootWindow* root_window = 96 aura::RootWindow* root_window =
96 aura::RootWindow::GetForAcceleratedWidget(xid); 97 aura::RootWindow::GetForAcceleratedWidget(xid);
97 aura::Window* window = root_window ? 98 aura::Window* window = root_window ?
98 views::DesktopNativeWidgetHelperAura::GetViewsWindowForRootWindow( 99 views::DesktopNativeWidgetHelperAura::GetViewsWindowForRootWindow(
99 root_window) : NULL; 100 root_window) : NULL;
100 101
101 desktop_activation_client_->ActivateWindow(window); 102 desktop_activation_client_->ActivateWindow(window);
102 } 103 }
103 104
104 } // namespace views 105 } // namespace views
OLDNEW
« ui/base/gtk/gdk_x_compat.h ('K') | « ui/views/widget/x11_desktop_handler.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698