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

Side by Side Diff: ash/root_window_controller.cc

Issue 18637004: Sets the background color of shelf is opaque black when maximized (2nd) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove log Created 7 years, 5 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 | « no previous file | ash/shelf/shelf_layout_manager.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) 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 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 // panel_layout_manager_ needs to be shut down before windows are destroyed. 351 // panel_layout_manager_ needs to be shut down before windows are destroyed.
352 if (panel_layout_manager_) { 352 if (panel_layout_manager_) {
353 panel_layout_manager_->Shutdown(); 353 panel_layout_manager_->Shutdown();
354 panel_layout_manager_ = NULL; 354 panel_layout_manager_ = NULL;
355 } 355 }
356 356
357 // TODO(harrym): Remove when Status Area Widget is a child view. 357 // TODO(harrym): Remove when Status Area Widget is a child view.
358 shelf_->ShutdownStatusAreaWidget(); 358 shelf_->ShutdownStatusAreaWidget();
359 359
360 if (shelf_->shelf_layout_manager()) 360 if (shelf_->shelf_layout_manager())
361 shelf_->shelf_layout_manager()->set_workspace_controller(NULL); 361 shelf_->shelf_layout_manager()->PrepareForShutdown();
362 362
363 // Close background widget first as it depends on tooltip. 363 // Close background widget first as it depends on tooltip.
364 wallpaper_controller_.reset(); 364 wallpaper_controller_.reset();
365 animating_wallpaper_controller_.reset(); 365 animating_wallpaper_controller_.reset();
366 366
367 workspace_controller_.reset(); 367 workspace_controller_.reset();
368 aura::client::SetTooltipClient(root_window_.get(), NULL); 368 aura::client::SetTooltipClient(root_window_.get(), NULL);
369 369
370 while (!root_window_->children().empty()) { 370 while (!root_window_->children().empty()) {
371 aura::Window* child = root_window_->children()[0]; 371 aura::Window* child = root_window_->children()[0];
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
714 714
715 void RootWindowController::OnTouchHudProjectionToggled(bool enabled) { 715 void RootWindowController::OnTouchHudProjectionToggled(bool enabled) {
716 if (enabled) 716 if (enabled)
717 EnableTouchHudProjection(); 717 EnableTouchHudProjection();
718 else 718 else
719 DisableTouchHudProjection(); 719 DisableTouchHudProjection();
720 } 720 }
721 721
722 } // namespace internal 722 } // namespace internal
723 } // namespace ash 723 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/shelf/shelf_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698