OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/aura/desktop.h" | 5 #include "ui/aura/desktop.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
12 #include "base/logging.h" | 12 #include "base/logging.h" |
13 #include "base/message_loop.h" | 13 #include "base/message_loop.h" |
14 #include "base/string_number_conversions.h" | 14 #include "base/string_number_conversions.h" |
15 #include "base/string_split.h" | 15 #include "base/string_split.h" |
16 #include "ui/aura/aura_switches.h" | 16 #include "ui/aura/aura_switches.h" |
17 #include "ui/aura/client/stacking_client.h" | 17 #include "ui/aura/client/stacking_client.h" |
18 #include "ui/aura/desktop_host.h" | 18 #include "ui/aura/desktop_host.h" |
19 #include "ui/aura/desktop_observer.h" | 19 #include "ui/aura/desktop_observer.h" |
20 #include "ui/aura/event.h" | 20 #include "ui/aura/event.h" |
21 #include "ui/aura/event_filter.h" | 21 #include "ui/aura/event_filter.h" |
22 #include "ui/aura/focus_manager.h" | 22 #include "ui/aura/focus_manager.h" |
23 #include "ui/aura/screen_aura.h" | 23 #include "ui/aura/screen_aura.h" |
24 #include "ui/aura/window.h" | 24 #include "ui/aura/window.h" |
25 #include "ui/aura/window_delegate.h" | 25 #include "ui/aura/window_delegate.h" |
26 #include "ui/base/hit_test.h" | 26 #include "ui/base/hit_test.h" |
| 27 #include "ui/base/ime/input_method.h" |
27 #include "ui/gfx/compositor/compositor.h" | 28 #include "ui/gfx/compositor/compositor.h" |
28 #include "ui/gfx/compositor/layer.h" | 29 #include "ui/gfx/compositor/layer.h" |
29 #include "ui/gfx/compositor/layer_animator.h" | 30 #include "ui/gfx/compositor/layer_animator.h" |
30 | 31 |
31 #ifdef USE_WEBKIT_COMPOSITOR | 32 #ifdef USE_WEBKIT_COMPOSITOR |
32 #include "ui/gfx/compositor/compositor_cc.h" | 33 #include "ui/gfx/compositor/compositor_cc.h" |
33 #endif | 34 #endif |
34 | 35 |
35 #if defined(USE_X11) | 36 #if defined(USE_X11) |
36 #include "base/message_pump_x.h" | 37 #include "base/message_pump_x.h" |
(...skipping 564 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
601 base::StringToInt(parts[0], &parsed_width) && parsed_width > 0 && | 602 base::StringToInt(parts[0], &parsed_width) && parsed_width > 0 && |
602 base::StringToInt(parts[1], &parsed_height) && parsed_height > 0) { | 603 base::StringToInt(parts[1], &parsed_height) && parsed_height > 0) { |
603 bounds.set_size(gfx::Size(parsed_width, parsed_height)); | 604 bounds.set_size(gfx::Size(parsed_width, parsed_height)); |
604 } else if (use_fullscreen_host_window_) { | 605 } else if (use_fullscreen_host_window_) { |
605 bounds = gfx::Rect(DesktopHost::GetNativeDisplaySize()); | 606 bounds = gfx::Rect(DesktopHost::GetNativeDisplaySize()); |
606 } | 607 } |
607 | 608 |
608 return bounds; | 609 return bounds; |
609 } | 610 } |
610 | 611 |
| 612 ui::InputMethod* Desktop::GetInputMethod() { |
| 613 return host_->GetInputMethod(); |
| 614 } |
| 615 |
611 } // namespace aura | 616 } // namespace aura |
OLD | NEW |