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

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

Issue 8585007: Added hotkey support to 8508009 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: for try bots 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 | « content/browser/renderer_host/render_widget_host_view_aura.cc ('k') | ui/aura/window.h » ('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/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"
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 active_window_(NULL), 407 active_window_(NULL),
408 mouse_button_flags_(0), 408 mouse_button_flags_(0),
409 last_cursor_(kCursorNull), 409 last_cursor_(kCursorNull),
410 in_destructor_(false), 410 in_destructor_(false),
411 screen_(new ScreenAura), 411 screen_(new ScreenAura),
412 capture_window_(NULL), 412 capture_window_(NULL),
413 mouse_pressed_handler_(NULL), 413 mouse_pressed_handler_(NULL),
414 mouse_moved_handler_(NULL), 414 mouse_moved_handler_(NULL),
415 focused_window_(NULL), 415 focused_window_(NULL),
416 touch_event_handler_(NULL) { 416 touch_event_handler_(NULL) {
417 set_name("RootWindow"); 417 SetName("RootWindow");
418 gfx::Screen::SetInstance(screen_); 418 gfx::Screen::SetInstance(screen_);
419 host_->SetDesktop(this); 419 host_->SetDesktop(this);
420 last_mouse_location_ = host_->QueryMouseLocation(); 420 last_mouse_location_ = host_->QueryMouseLocation();
421 421
422 if (ui::Compositor::compositor_factory()) { 422 if (ui::Compositor::compositor_factory()) {
423 compositor_ = (*ui::Compositor::compositor_factory())(this); 423 compositor_ = (*ui::Compositor::compositor_factory())(this);
424 } else { 424 } else {
425 #ifdef USE_WEBKIT_COMPOSITOR 425 #ifdef USE_WEBKIT_COMPOSITOR
426 ui::CompositorCC::Initialize(false); 426 ui::CompositorCC::Initialize(false);
427 #endif 427 #endif
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
607 base::StringToInt(parts[1], &parsed_height) && parsed_height > 0) { 607 base::StringToInt(parts[1], &parsed_height) && parsed_height > 0) {
608 bounds.set_size(gfx::Size(parsed_width, parsed_height)); 608 bounds.set_size(gfx::Size(parsed_width, parsed_height));
609 } else if (use_fullscreen_host_window_) { 609 } else if (use_fullscreen_host_window_) {
610 bounds = gfx::Rect(DesktopHost::GetNativeScreenSize()); 610 bounds = gfx::Rect(DesktopHost::GetNativeScreenSize());
611 } 611 }
612 612
613 return bounds; 613 return bounds;
614 } 614 }
615 615
616 } // namespace aura 616 } // namespace aura
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_aura.cc ('k') | ui/aura/window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698