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 "content/shell/browser/minimal_shell.h" | 5 #include "content/shell/browser/minimal_shell.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/env.h" |
8 #include "ui/aura/focus_manager.h" | 9 #include "ui/aura/focus_manager.h" |
9 #include "ui/aura/root_window.h" | 10 #include "ui/aura/root_window.h" |
10 #include "ui/aura/test/test_activation_client.h" | 11 #include "ui/aura/test/test_activation_client.h" |
11 #include "ui/views/corewm/compound_event_filter.h" | 12 #include "ui/views/corewm/compound_event_filter.h" |
12 #include "ui/views/corewm/input_method_event_filter.h" | 13 #include "ui/views/corewm/input_method_event_filter.h" |
13 | 14 |
14 namespace content { | 15 namespace content { |
15 | 16 |
16 MinimalShell::MinimalShell(const gfx::Size& default_window_size) { | 17 MinimalShell::MinimalShell(const gfx::Size& default_window_size) { |
| 18 aura::Env::CreateInstance(); |
17 root_window_.reset(new aura::RootWindow( | 19 root_window_.reset(new aura::RootWindow( |
18 aura::RootWindow::CreateParams( | 20 aura::RootWindow::CreateParams( |
19 gfx::Rect(default_window_size)))); | 21 gfx::Rect(default_window_size)))); |
20 root_window_->Init(); | 22 root_window_->Init(); |
21 aura::client::SetStackingClient(root_window_.get(), this); | 23 aura::client::SetStackingClient(root_window_.get(), this); |
22 | 24 |
23 focus_client_.reset(new aura::FocusManager); | 25 focus_client_.reset(new aura::FocusManager); |
24 aura::client::SetFocusClient(root_window_.get(), focus_client_.get()); | 26 aura::client::SetFocusClient(root_window_.get(), focus_client_.get()); |
25 | 27 |
26 root_window_event_filter_ = new views::corewm::CompoundEventFilter; | 28 root_window_event_filter_ = new views::corewm::CompoundEventFilter; |
(...skipping 18 matching lines...) Expand all Loading... |
45 } | 47 } |
46 | 48 |
47 aura::Window* MinimalShell::GetDefaultParent( | 49 aura::Window* MinimalShell::GetDefaultParent( |
48 aura::Window* context, | 50 aura::Window* context, |
49 aura::Window* window, | 51 aura::Window* window, |
50 const gfx::Rect& bounds) { | 52 const gfx::Rect& bounds) { |
51 return root_window_.get(); | 53 return root_window_.get(); |
52 } | 54 } |
53 | 55 |
54 } // namespace content | 56 } // namespace content |
OLD | NEW |