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

Side by Side Diff: ash/root_window_controller.cc

Issue 11314013: Register a separate default ui::EventTarget for Aura (Ash) to ensure that it does not interfere wit… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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 | « no previous file | ash/shell.h » ('j') | ui/aura/root_window.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "ash/root_window_controller.h" 5 #include "ash/root_window_controller.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/desktop_background/desktop_background_widget_controller.h" 9 #include "ash/desktop_background/desktop_background_widget_controller.h"
10 #include "ash/display/display_controller.h" 10 #include "ash/display/display_controller.h"
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 } // namespace 150 } // namespace
151 151
152 namespace internal { 152 namespace internal {
153 153
154 RootWindowController::RootWindowController(aura::RootWindow* root_window) 154 RootWindowController::RootWindowController(aura::RootWindow* root_window)
155 : root_window_(root_window), 155 : root_window_(root_window),
156 root_window_layout_(NULL), 156 root_window_layout_(NULL),
157 status_area_widget_(NULL), 157 status_area_widget_(NULL),
158 shelf_(NULL), 158 shelf_(NULL),
159 panel_layout_manager_(NULL) { 159 panel_layout_manager_(NULL) {
160 root_window->set_parent_event_target(Shell::GetInstance());
160 SetRootWindowController(root_window, this); 161 SetRootWindowController(root_window, this);
161 screen_dimmer_.reset(new ScreenDimmer(root_window)); 162 screen_dimmer_.reset(new ScreenDimmer(root_window));
162 } 163 }
163 164
164 RootWindowController::~RootWindowController() { 165 RootWindowController::~RootWindowController() {
165 Shutdown(); 166 Shutdown();
166 root_window_.reset(); 167 root_window_.reset();
167 } 168 }
168 169
169 // static 170 // static
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after
616 "OverlayContainer", 617 "OverlayContainer",
617 lock_screen_related_containers); 618 lock_screen_related_containers);
618 SetUsesScreenCoordinates(overlay_container); 619 SetUsesScreenCoordinates(overlay_container);
619 620
620 CreateContainer(kShellWindowId_PowerButtonAnimationContainer, 621 CreateContainer(kShellWindowId_PowerButtonAnimationContainer,
621 "PowerButtonAnimationContainer", root_window) ; 622 "PowerButtonAnimationContainer", root_window) ;
622 } 623 }
623 624
624 } // namespace internal 625 } // namespace internal
625 } // namespace ash 626 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/shell.h » ('j') | ui/aura/root_window.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698