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

Side by Side Diff: ash/root_window_controller.cc

Issue 16968003: Rewrite scoped_ptr<T>(NULL) to use the default ctor in ash/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 months 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 | « ash/drag_drop/drag_drop_controller.cc ('k') | ash/shelf/shelf_widget.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) 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/ash_constants.h" 9 #include "ash/ash_constants.h"
10 #include "ash/ash_switches.h" 10 #include "ash/ash_switches.h"
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 container->SetProperty(internal::kUsesScreenCoordinatesKey, true); 159 container->SetProperty(internal::kUsesScreenCoordinatesKey, true);
160 } 160 }
161 161
162 } // namespace 162 } // namespace
163 163
164 namespace internal { 164 namespace internal {
165 165
166 RootWindowController::RootWindowController(aura::RootWindow* root_window) 166 RootWindowController::RootWindowController(aura::RootWindow* root_window)
167 : root_window_(root_window), 167 : root_window_(root_window),
168 root_window_layout_(NULL), 168 root_window_layout_(NULL),
169 shelf_(NULL),
170 panel_layout_manager_(NULL), 169 panel_layout_manager_(NULL),
171 touch_observer_hud_(NULL) { 170 touch_observer_hud_(NULL) {
172 SetRootWindowController(root_window, this); 171 SetRootWindowController(root_window, this);
173 screen_dimmer_.reset(new ScreenDimmer(root_window)); 172 screen_dimmer_.reset(new ScreenDimmer(root_window));
174 173
175 stacking_controller_.reset(new ash::StackingController); 174 stacking_controller_.reset(new ash::StackingController);
176 aura::client::SetStackingClient(root_window, stacking_controller_.get()); 175 aura::client::SetStackingClient(root_window, stacking_controller_.get());
177 } 176 }
178 177
179 RootWindowController::~RootWindowController() { 178 RootWindowController::~RootWindowController() {
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after
627 "OverlayContainer", 626 "OverlayContainer",
628 lock_screen_related_containers); 627 lock_screen_related_containers);
629 SetUsesScreenCoordinates(overlay_container); 628 SetUsesScreenCoordinates(overlay_container);
630 629
631 CreateContainer(kShellWindowId_PowerButtonAnimationContainer, 630 CreateContainer(kShellWindowId_PowerButtonAnimationContainer,
632 "PowerButtonAnimationContainer", root_window) ; 631 "PowerButtonAnimationContainer", root_window) ;
633 } 632 }
634 633
635 } // namespace internal 634 } // namespace internal
636 } // namespace ash 635 } // namespace ash
OLDNEW
« no previous file with comments | « ash/drag_drop/drag_drop_controller.cc ('k') | ash/shelf/shelf_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698