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

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

Issue 23903056: Add a container window to host the desktop window hierarchy in AURA. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 3 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
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_root_window_host_win.cc ('k') | 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_aura/desktop_root_window_host_x11.h" 5 #include "ui/views/widget/desktop_aura/desktop_root_window_host_x11.h"
6 6
7 #include <X11/extensions/shape.h> 7 #include <X11/extensions/shape.h>
8 #include <X11/extensions/XInput2.h> 8 #include <X11/extensions/XInput2.h>
9 #include <X11/Xatom.h> 9 #include <X11/Xatom.h>
10 #include <X11/Xregion.h> 10 #include <X11/Xregion.h>
(...skipping 907 matching lines...) Expand 10 before | Expand all | Expand 10 after
918 918
919 native_widget_delegate_->OnNativeWidgetCreated(true); 919 native_widget_delegate_->OnNativeWidgetCreated(true);
920 920
921 desktop_native_widget_aura_->CreateCaptureClient(root_window_); 921 desktop_native_widget_aura_->CreateCaptureClient(root_window_);
922 922
923 // Ensure that the X11DesktopHandler exists so that it dispatches activation 923 // Ensure that the X11DesktopHandler exists so that it dispatches activation
924 // messages to us. 924 // messages to us.
925 X11DesktopHandler::get(); 925 X11DesktopHandler::get();
926 926
927 corewm::FocusController* focus_controller = 927 corewm::FocusController* focus_controller =
928 new corewm::FocusController(new DesktopFocusRules); 928 new corewm::FocusController(new DesktopFocusRules(content_window_));
929 focus_client_.reset(focus_controller); 929 focus_client_.reset(focus_controller);
930 aura::client::SetFocusClient(root_window_, focus_controller); 930 aura::client::SetFocusClient(root_window_, focus_controller);
931 aura::client::SetActivationClient(root_window_, focus_controller); 931 aura::client::SetActivationClient(root_window_, focus_controller);
932 root_window_->AddPreTargetHandler(focus_controller); 932 root_window_->AddPreTargetHandler(focus_controller);
933 933
934 dispatcher_client_.reset(new DesktopDispatcherClient); 934 dispatcher_client_.reset(new DesktopDispatcherClient);
935 aura::client::SetDispatcherClient(root_window_, 935 aura::client::SetDispatcherClient(root_window_,
936 dispatcher_client_.get()); 936 dispatcher_client_.get());
937 937
938 views::DesktopNativeCursorManager* desktop_native_cursor_manager = 938 views::DesktopNativeCursorManager* desktop_native_cursor_manager =
(...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after
1359 if (linux_ui) { 1359 if (linux_ui) {
1360 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(); 1360 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme();
1361 if (native_theme) 1361 if (native_theme)
1362 return native_theme; 1362 return native_theme;
1363 } 1363 }
1364 1364
1365 return ui::NativeTheme::instance(); 1365 return ui::NativeTheme::instance();
1366 } 1366 }
1367 1367
1368 } // namespace views 1368 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_root_window_host_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698