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

Unified Diff: ash/display/output_configurator_animation.cc

Issue 224113005: Eliminate ash::internal namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/display/output_configurator_animation.h ('k') | ash/display/projecting_observer_chromeos.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/output_configurator_animation.cc
diff --git a/ash/display/output_configurator_animation.cc b/ash/display/output_configurator_animation.cc
index 983e574d16a0022f863f98b90e29a7e481366d41..8d02a2fcc72e0db59392702da6876ffe4eb0a8f3 100644
--- a/ash/display/output_configurator_animation.cc
+++ b/ash/display/output_configurator_animation.cc
@@ -18,7 +18,6 @@
#include "ui/compositor/scoped_layer_animation_settings.h"
namespace ash {
-namespace internal {
namespace {
const int kFadingAnimationDurationInMS = 200;
@@ -122,9 +121,9 @@ void OutputConfiguratorAnimation::StartFadeOutAnimation(
ui::Layer* hiding_layer = new ui::Layer(ui::LAYER_SOLID_COLOR);
hiding_layer->SetColor(SK_ColorBLACK);
hiding_layer->SetBounds(root_window->bounds());
- ui::Layer* parent = ash::Shell::GetContainer(
- root_window,
- ash::internal::kShellWindowId_OverlayContainer)->layer();
+ ui::Layer* parent =
+ ash::Shell::GetContainer(root_window,
+ ash::kShellWindowId_OverlayContainer)->layer();
parent->Add(hiding_layer);
hiding_layer->SetOpacity(0.0);
@@ -181,9 +180,9 @@ void OutputConfiguratorAnimation::StartFadeInAnimation() {
hiding_layer = new ui::Layer(ui::LAYER_SOLID_COLOR);
hiding_layer->SetColor(SK_ColorBLACK);
hiding_layer->SetBounds(root_window->bounds());
- ui::Layer* parent = ash::Shell::GetContainer(
- root_window,
- ash::internal::kShellWindowId_OverlayContainer)->layer();
+ ui::Layer* parent =
+ ash::Shell::GetContainer(
+ root_window, ash::kShellWindowId_OverlayContainer)->layer();
parent->Add(hiding_layer);
hiding_layer->SetOpacity(1.0f);
hiding_layer->SetVisible(true);
@@ -225,5 +224,4 @@ void OutputConfiguratorAnimation::ClearHidingLayers() {
hiding_layers_.clear();
}
-} // namespace internal
} // namespace ash
« no previous file with comments | « ash/display/output_configurator_animation.h ('k') | ash/display/projecting_observer_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698