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

Side by Side Diff: ui/aura/root_window.cc

Issue 8576005: IME (input method editor) support for Aura, part 3 of 3: Use ui::InputMethod in ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: moving IME code to aura_shell. not ready for review Created 9 years 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 | Annotate | Revision Log
« no previous file with comments | « ui/aura/root_window.h ('k') | ui/aura/root_window_host_linux.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/root_window.h" 5 #include "ui/aura/root_window.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"
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 ALLOW_THIS_IN_INITIALIZER_LIST(schedule_paint_factory_(this)), 404 ALLOW_THIS_IN_INITIALIZER_LIST(schedule_paint_factory_(this)),
405 active_window_(NULL), 405 active_window_(NULL),
406 mouse_button_flags_(0), 406 mouse_button_flags_(0),
407 last_cursor_(kCursorNull), 407 last_cursor_(kCursorNull),
408 in_destructor_(false), 408 in_destructor_(false),
409 screen_(new ScreenAura), 409 screen_(new ScreenAura),
410 capture_window_(NULL), 410 capture_window_(NULL),
411 mouse_pressed_handler_(NULL), 411 mouse_pressed_handler_(NULL),
412 mouse_moved_handler_(NULL), 412 mouse_moved_handler_(NULL),
413 focused_window_(NULL), 413 focused_window_(NULL),
414 touch_event_handler_(NULL) { 414 touch_event_handler_(NULL),
415 input_method_(NULL) {
415 SetName("RootWindow"); 416 SetName("RootWindow");
416 gfx::Screen::SetInstance(screen_); 417 gfx::Screen::SetInstance(screen_);
417 host_->SetRootWindow(this); 418 host_->SetRootWindow(this);
418 last_mouse_location_ = host_->QueryMouseLocation(); 419 last_mouse_location_ = host_->QueryMouseLocation();
419 420
420 if (ui::Compositor::compositor_factory()) { 421 if (ui::Compositor::compositor_factory()) {
421 compositor_ = (*ui::Compositor::compositor_factory())(this); 422 compositor_ = (*ui::Compositor::compositor_factory())(this);
422 } else { 423 } else {
423 #ifdef USE_WEBKIT_COMPOSITOR 424 #ifdef USE_WEBKIT_COMPOSITOR
424 ui::CompositorCC::Initialize(false); 425 ui::CompositorCC::Initialize(false);
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
605 base::StringToInt(parts[1], &parsed_height) && parsed_height > 0) { 606 base::StringToInt(parts[1], &parsed_height) && parsed_height > 0) {
606 bounds.set_size(gfx::Size(parsed_width, parsed_height)); 607 bounds.set_size(gfx::Size(parsed_width, parsed_height));
607 } else if (use_fullscreen_host_window_) { 608 } else if (use_fullscreen_host_window_) {
608 bounds = gfx::Rect(RootWindowHost::GetNativeScreenSize()); 609 bounds = gfx::Rect(RootWindowHost::GetNativeScreenSize());
609 } 610 }
610 611
611 return bounds; 612 return bounds;
612 } 613 }
613 614
614 } // namespace aura 615 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/root_window.h ('k') | ui/aura/root_window_host_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698