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

Side by Side Diff: ash/wm/session_state_animator.cc

Issue 14297013: Cleanup: Remove unnecessary ".get()" from scoped_ptrs<>. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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/wm/screen_dimmer.cc ('k') | ash/wm/session_state_controller_impl2.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/wm/session_state_animator.h" 5 #include "ash/wm/session_state_animator.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_window_ids.h" 8 #include "ash/shell_window_ids.h"
9 #include "ash/wm/window_animations.h" 9 #include "ash/wm/window_animations.h"
10 #include "ui/aura/client/aura_constants.h" 10 #include "ui/aura/client/aura_constants.h"
(...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after
607 window, 1.0, duration, ui::Tween::EASE_IN, observer); 607 window, 1.0, duration, ui::Tween::EASE_IN, observer);
608 break; 608 break;
609 case ANIMATION_UNDO_GRAYSCALE_BRIGHTNESS: 609 case ANIMATION_UNDO_GRAYSCALE_BRIGHTNESS:
610 StartGrayscaleBrightnessAnimationForWindow( 610 StartGrayscaleBrightnessAnimationForWindow(
611 window, 0.0, duration, ui::Tween::EASE_IN_OUT, observer); 611 window, 0.0, duration, ui::Tween::EASE_IN_OUT, observer);
612 break; 612 break;
613 } 613 }
614 } 614 }
615 615
616 void SessionStateAnimator::CreateForeground() { 616 void SessionStateAnimator::CreateForeground() {
617 if (foreground_.get()) 617 if (foreground_)
618 return; 618 return;
619 aura::Window* window = Shell::GetContainer( 619 aura::Window* window = Shell::GetContainer(
620 Shell::GetPrimaryRootWindow(), 620 Shell::GetPrimaryRootWindow(),
621 internal::kShellWindowId_PowerButtonAnimationContainer); 621 internal::kShellWindowId_PowerButtonAnimationContainer);
622 HideWindowImmediately(window, NULL); 622 HideWindowImmediately(window, NULL);
623 foreground_.reset( 623 foreground_.reset(
624 new ColoredWindowController(window, "SessionStateAnimatorForeground")); 624 new ColoredWindowController(window, "SessionStateAnimatorForeground"));
625 foreground_->SetColor(SK_ColorWHITE); 625 foreground_->SetColor(SK_ColorWHITE);
626 foreground_->GetWidget()->Show(); 626 foreground_->GetWidget()->Show();
627 } 627 }
628 628
629 void SessionStateAnimator::DropForeground() { 629 void SessionStateAnimator::DropForeground() {
630 foreground_.reset(); 630 foreground_.reset();
631 } 631 }
632 632
633 } // namespace internal 633 } // namespace internal
634 } // namespace ash 634 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/screen_dimmer.cc ('k') | ash/wm/session_state_controller_impl2.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698