| OLD | NEW |
| 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 910 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 921 root_window_host_delegate_ = root_window_; | 921 root_window_host_delegate_ = root_window_; |
| 922 | 922 |
| 923 // If we're given a parent, we need to mark ourselves as transient to another | 923 // If we're given a parent, we need to mark ourselves as transient to another |
| 924 // window. Otherwise activation gets screwy. | 924 // window. Otherwise activation gets screwy. |
| 925 gfx::NativeView parent = params.parent; | 925 gfx::NativeView parent = params.parent; |
| 926 if (!params.child && params.parent) | 926 if (!params.child && params.parent) |
| 927 parent->AddTransientChild(content_window_); | 927 parent->AddTransientChild(content_window_); |
| 928 | 928 |
| 929 native_widget_delegate_->OnNativeWidgetCreated(true); | 929 native_widget_delegate_->OnNativeWidgetCreated(true); |
| 930 | 930 |
| 931 desktop_native_widget_aura_->InstallWindowModalityController(root_window_); |
| 931 desktop_native_widget_aura_->CreateCaptureClient(root_window_); | 932 desktop_native_widget_aura_->CreateCaptureClient(root_window_); |
| 932 | 933 |
| 933 // Ensure that the X11DesktopHandler exists so that it dispatches activation | 934 // Ensure that the X11DesktopHandler exists so that it dispatches activation |
| 934 // messages to us. | 935 // messages to us. |
| 935 X11DesktopHandler::get(); | 936 X11DesktopHandler::get(); |
| 936 | 937 |
| 937 corewm::FocusController* focus_controller = | 938 corewm::FocusController* focus_controller = |
| 938 new corewm::FocusController(new DesktopFocusRules(content_window_)); | 939 new corewm::FocusController(new DesktopFocusRules(content_window_)); |
| 939 focus_client_.reset(focus_controller); | 940 focus_client_.reset(focus_controller); |
| 940 aura::client::SetFocusClient(root_window_, focus_controller); | 941 aura::client::SetFocusClient(root_window_, focus_controller); |
| (...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1369 if (linux_ui) { | 1370 if (linux_ui) { |
| 1370 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(); | 1371 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(); |
| 1371 if (native_theme) | 1372 if (native_theme) |
| 1372 return native_theme; | 1373 return native_theme; |
| 1373 } | 1374 } |
| 1374 | 1375 |
| 1375 return ui::NativeTheme::instance(); | 1376 return ui::NativeTheme::instance(); |
| 1376 } | 1377 } |
| 1377 | 1378 |
| 1378 } // namespace views | 1379 } // namespace views |
| OLD | NEW |