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 "content/shell/minimal_ash.h" | 5 #include "content/shell/minimal_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 MinimalAsh::MinimalAsh() { | 16 MinimalAsh::MinimalAsh(gfx::Size default_window_size) { |
17 root_window_.reset(new aura::RootWindow( | 17 root_window_.reset(new aura::RootWindow( |
18 aura::RootWindow::CreateParams(gfx::Rect(100, 100)))); | 18 aura::RootWindow::CreateParams( |
19 gfx::Rect(default_window_size.width(), | |
sky
2013/01/23 22:12:10
There is a constructor that takes a Size.
Nayan
2013/01/23 22:23:10
Done.
| |
20 default_window_size.height())))); | |
19 root_window_->Init(); | 21 root_window_->Init(); |
20 aura::client::SetStackingClient(root_window_.get(), this); | 22 aura::client::SetStackingClient(root_window_.get(), this); |
21 | 23 |
22 focus_client_.reset(new aura::FocusManager); | 24 focus_client_.reset(new aura::FocusManager); |
23 aura::client::SetFocusClient(root_window_.get(), focus_client_.get()); | 25 aura::client::SetFocusClient(root_window_.get(), focus_client_.get()); |
24 | 26 |
25 root_window_event_filter_ = new views::corewm::CompoundEventFilter; | 27 root_window_event_filter_ = new views::corewm::CompoundEventFilter; |
26 // Pass ownership of the filter to the root_window. | 28 // Pass ownership of the filter to the root_window. |
27 root_window_->SetEventFilter(root_window_event_filter_); | 29 root_window_->SetEventFilter(root_window_event_filter_); |
28 | 30 |
(...skipping 15 matching lines...) Expand all Loading... | |
44 } | 46 } |
45 | 47 |
46 aura::Window* MinimalAsh::GetDefaultParent( | 48 aura::Window* MinimalAsh::GetDefaultParent( |
47 aura::Window* context, | 49 aura::Window* context, |
48 aura::Window* window, | 50 aura::Window* window, |
49 const gfx::Rect& bounds) { | 51 const gfx::Rect& bounds) { |
50 return root_window_.get(); | 52 return root_window_.get(); |
51 } | 53 } |
52 | 54 |
53 } // namespace content | 55 } // namespace content |
OLD | NEW |