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

Side by Side Diff: content/shell/shell_stacking_client_ash.cc

Issue 11614037: Call ShowRootWindow on NativeWindow's RootWindow to display the window. (Closed) Base URL: https://git.chromium.org/chromium/src.git@master
Patch Set: Reworked patch Created 7 years, 11 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 "content/shell/shell_stacking_client_ash.h" 5 #include "content/shell/shell_stacking_client_ash.h"
6 6
7 #include "ui/aura/client/default_capture_client.h" 7 #include "ui/aura/client/default_capture_client.h"
8 #include "ui/aura/focus_manager.h" 8 #include "ui/aura/focus_manager.h"
9 #include "ui/aura/root_window.h" 9 #include "ui/aura/root_window.h"
10 #include "ui/aura/test/test_activation_client.h" 10 #include "ui/aura/test/test_activation_client.h"
11 #include "ui/views/corewm/compound_event_filter.h" 11 #include "ui/views/corewm/compound_event_filter.h"
12 #include "ui/views/corewm/input_method_event_filter.h" 12 #include "ui/views/corewm/input_method_event_filter.h"
13 13
14 namespace content { 14 namespace content {
15 15
16 ShellStackingClientAsh::ShellStackingClientAsh() { 16 ShellStackingClientAsh::ShellStackingClientAsh(
17 scoped_ptr<aura::RootWindow> root_window)
18 : root_window_(root_window.Pass()){
19 Init();
17 } 20 }
18 21
19 ShellStackingClientAsh::~ShellStackingClientAsh() { 22 ShellStackingClientAsh::~ShellStackingClientAsh() {
20 if (root_window_.get()) 23 if (root_window_.get())
21 root_window_event_filter_->RemoveHandler(input_method_filter_.get()); 24 root_window_event_filter_->RemoveHandler(input_method_filter_.get());
22 25
23 aura::client::SetStackingClient(NULL); 26 aura::client::SetStackingClient(NULL);
24 } 27 }
25 28
29 void ShellStackingClientAsh::Init() {
30 focus_client_.reset(new aura::FocusManager);
31 aura::client::SetFocusClient(root_window_.get(), focus_client_.get());
32
33 root_window_event_filter_ = new views::corewm::CompoundEventFilter;
34 // Pass ownership of the filter to the root_window.
35 root_window_->SetEventFilter(root_window_event_filter_);
36
37 input_method_filter_.reset(new views::corewm::InputMethodEventFilter(
38 root_window_->GetAcceleratedWidget()));
39 input_method_filter_->SetInputMethodPropertyInRootWindow(
40 root_window_.get());
41 root_window_event_filter_->AddHandler(input_method_filter_.get());
42
43 test_activation_client_.reset(
44 new aura::test::TestActivationClient(root_window_.get()));
45 capture_client_.reset(
46 new aura::client::DefaultCaptureClient(root_window_.get()));
47 }
48
26 aura::Window* ShellStackingClientAsh::GetDefaultParent( 49 aura::Window* ShellStackingClientAsh::GetDefaultParent(
27 aura::Window* context, 50 aura::Window* context,
28 aura::Window* window, 51 aura::Window* window,
29 const gfx::Rect& bounds) { 52 const gfx::Rect& bounds) {
30 if (!root_window_.get()) {
31 root_window_.reset(new aura::RootWindow(
32 aura::RootWindow::CreateParams(gfx::Rect(100, 100))));
33 root_window_->Init();
34 focus_client_.reset(new aura::FocusManager);
35 aura::client::SetFocusClient(root_window_.get(), focus_client_.get());
36
37 root_window_event_filter_ = new views::corewm::CompoundEventFilter;
38 // Pass ownership of the filter to the root_window.
39 root_window_->SetEventFilter(root_window_event_filter_);
40
41 input_method_filter_.reset(new views::corewm::InputMethodEventFilter(
42 root_window_->GetAcceleratedWidget()));
43 input_method_filter_->SetInputMethodPropertyInRootWindow(
44 root_window_.get());
45 root_window_event_filter_->AddHandler(input_method_filter_.get());
46
47 test_activation_client_.reset(
48 new aura::test::TestActivationClient(root_window_.get()));
49
50 capture_client_.reset(
51 new aura::client::DefaultCaptureClient(root_window_.get()));
52 }
53 return root_window_.get(); 53 return root_window_.get();
54 } 54 }
55 55
56 } // namespace content 56 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698