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

Unified Diff: ash/wm/dock/docked_window_layout_manager.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/wm/dock/docked_window_layout_manager.h ('k') | ash/wm/dock/docked_window_layout_manager_observer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/dock/docked_window_layout_manager.cc
diff --git a/ash/wm/dock/docked_window_layout_manager.cc b/ash/wm/dock/docked_window_layout_manager.cc
index 04273e1bedd2bc5ed1f01d1ee004fc3133877912..add93f488f20a773d49d211c3a7904edf204b2e2 100644
--- a/ash/wm/dock/docked_window_layout_manager.cc
+++ b/ash/wm/dock/docked_window_layout_manager.cc
@@ -41,7 +41,6 @@
#include "ui/wm/public/activation_client.h"
namespace ash {
-namespace internal {
// Minimum, maximum width of the dock area and a width of the gap
// static
@@ -58,7 +57,7 @@ const int kFadeDurationMs = 60;
const int kMinimizeDurationMs = 720;
class DockedBackgroundWidget : public views::Widget,
- public internal::BackgroundAnimatorDelegate {
+ public BackgroundAnimatorDelegate {
public:
explicit DockedBackgroundWidget(aura::Window* container)
: alignment_(DOCKED_ALIGNMENT_NONE),
@@ -147,7 +146,7 @@ class DockedBackgroundWidget : public views::Widget,
set_focus_on_creation(false);
Init(params);
SetVisibilityChangedAnimationsEnabled(false);
- GetNativeWindow()->SetProperty(internal::kStayInSameRootWindowKey, true);
+ GetNativeWindow()->SetProperty(kStayInSameRootWindowKey, true);
opaque_background_.SetColor(SK_ColorBLACK);
opaque_background_.SetBounds(gfx::Rect(GetWindowBoundsInScreen().size()));
opaque_background_.SetOpacity(0.0f);
@@ -194,7 +193,7 @@ class DockedBackgroundWidget : public views::Widget,
DockedAlignment alignment_;
// The animator for the background transitions.
- internal::BackgroundAnimator background_animator_;
+ BackgroundAnimator background_animator_;
// The alpha to use for drawing image assets covering the docked background.
int alpha_;
@@ -712,8 +711,8 @@ void DockedWindowLayoutManager::SetChildBounds(
SetChildBoundsDirect(child, requested_bounds);
if (IsPopupOrTransient(child))
return;
- ShelfLayoutManager* shelf_layout = internal::ShelfLayoutManager::ForShelf(
- dock_container_);
+ ShelfLayoutManager* shelf_layout =
+ ShelfLayoutManager::ForShelf(dock_container_);
if (shelf_layout)
shelf_layout->UpdateVisibilityState();
}
@@ -1316,5 +1315,4 @@ void DockedWindowLayoutManager::OnKeyboardBoundsChanging(
UpdateDockBounds(DockedWindowLayoutManagerObserver::KEYBOARD_BOUNDS_CHANGING);
}
-} // namespace internal
} // namespace ash
« no previous file with comments | « ash/wm/dock/docked_window_layout_manager.h ('k') | ash/wm/dock/docked_window_layout_manager_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698