OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/shell/minimal_shell.h" | 5 #include "ui/shell/minimal_shell.h" |
6 | 6 |
7 #include "ui/aura/client/default_activation_client.h" | 7 #include "ui/aura/client/default_activation_client.h" |
8 #include "ui/aura/client/default_capture_client.h" | 8 #include "ui/aura/client/default_capture_client.h" |
9 #include "ui/aura/env.h" | 9 #include "ui/aura/env.h" |
10 #include "ui/aura/root_window.h" | 10 #include "ui/aura/root_window.h" |
(...skipping 12 matching lines...) Expand all Loading... |
23 aura::client::SetWindowTreeClient(root_window_->window(), this); | 23 aura::client::SetWindowTreeClient(root_window_->window(), this); |
24 | 24 |
25 focus_client_.reset(new aura::test::TestFocusClient); | 25 focus_client_.reset(new aura::test::TestFocusClient); |
26 aura::client::SetFocusClient(root_window_->window(), focus_client_.get()); | 26 aura::client::SetFocusClient(root_window_->window(), focus_client_.get()); |
27 | 27 |
28 root_window_event_filter_ = new views::corewm::CompoundEventFilter; | 28 root_window_event_filter_ = new views::corewm::CompoundEventFilter; |
29 // Pass ownership of the filter to the root_window. | 29 // Pass ownership of the filter to the root_window. |
30 root_window_->window()->SetEventFilter(root_window_event_filter_); | 30 root_window_->window()->SetEventFilter(root_window_event_filter_); |
31 | 31 |
32 input_method_filter_.reset(new views::corewm::InputMethodEventFilter( | 32 input_method_filter_.reset(new views::corewm::InputMethodEventFilter( |
33 root_window_->GetAcceleratedWidget())); | 33 root_window_->host()->GetAcceleratedWidget())); |
34 input_method_filter_->SetInputMethodPropertyInRootWindow( | 34 input_method_filter_->SetInputMethodPropertyInRootWindow( |
35 root_window_->window()); | 35 root_window_->window()); |
36 root_window_event_filter_->AddHandler(input_method_filter_.get()); | 36 root_window_event_filter_->AddHandler(input_method_filter_.get()); |
37 | 37 |
38 activation_client_.reset( | 38 activation_client_.reset( |
39 new aura::client::DefaultActivationClient(root_window_->window())); | 39 new aura::client::DefaultActivationClient(root_window_->window())); |
40 | 40 |
41 capture_client_.reset( | 41 capture_client_.reset( |
42 new aura::client::DefaultCaptureClient(root_window_->window())); | 42 new aura::client::DefaultCaptureClient(root_window_->window())); |
43 } | 43 } |
44 | 44 |
45 MinimalShell::~MinimalShell() { | 45 MinimalShell::~MinimalShell() { |
46 root_window_event_filter_->RemoveHandler(input_method_filter_.get()); | 46 root_window_event_filter_->RemoveHandler(input_method_filter_.get()); |
47 } | 47 } |
48 | 48 |
49 aura::Window* MinimalShell::GetDefaultParent( | 49 aura::Window* MinimalShell::GetDefaultParent( |
50 aura::Window* context, | 50 aura::Window* context, |
51 aura::Window* window, | 51 aura::Window* window, |
52 const gfx::Rect& bounds) { | 52 const gfx::Rect& bounds) { |
53 return root_window_->window(); | 53 return root_window_->window(); |
54 } | 54 } |
55 | 55 |
56 } // namespace shell | 56 } // namespace shell |
OLD | NEW |