diff options
Diffstat (limited to 'ash/wm')
129 files changed, 475 insertions, 794 deletions
diff --git a/ash/wm/always_on_top_controller.cc b/ash/wm/always_on_top_controller.cc index c0f7356..ab397c9 100644 --- a/ash/wm/always_on_top_controller.cc +++ b/ash/wm/always_on_top_controller.cc @@ -10,7 +10,6 @@ #include "ui/aura/window.h" namespace ash { -namespace internal { AlwaysOnTopController::AlwaysOnTopController() : always_on_top_container_(NULL) { @@ -68,5 +67,4 @@ void AlwaysOnTopController::OnWindowDestroyed(aura::Window* window) { always_on_top_container_ = NULL; } -} // namespace internal } // namespace ash diff --git a/ash/wm/always_on_top_controller.h b/ash/wm/always_on_top_controller.h index 57fbf99..fda496a 100644 --- a/ash/wm/always_on_top_controller.h +++ b/ash/wm/always_on_top_controller.h @@ -14,7 +14,6 @@ class Window; } namespace ash { -namespace internal { // AlwaysOnTopController puts window into proper containers based on its // 'AlwaysOnTop' property. That is, putting a window into the worskpace @@ -45,7 +44,6 @@ class AlwaysOnTopController : public aura::WindowObserver { DISALLOW_COPY_AND_ASSIGN(AlwaysOnTopController); }; -} // namepsace internal } // namepsace ash #endif // ASH_WM_ALWAYS_ON_TOP_CONTROLLER_H_ diff --git a/ash/wm/app_list_controller.cc b/ash/wm/app_list_controller.cc index b00319c..cf5e04d 100644 --- a/ash/wm/app_list_controller.cc +++ b/ash/wm/app_list_controller.cc @@ -27,8 +27,6 @@ #include "ui/views/widget/widget.h" namespace ash { -namespace internal { - namespace { // Duration for show/hide animation in milliseconds. @@ -295,12 +293,12 @@ void AppListController::ProcessLocatedEvent(ui::LocatedEvent* event) { RootWindowController* root_controller = GetRootWindowController(target->GetRootWindow()); if (root_controller) { - aura::Window* menu_container = root_controller->GetContainer( - internal::kShellWindowId_MenuContainer); + aura::Window* menu_container = + root_controller->GetContainer(kShellWindowId_MenuContainer); if (menu_container->Contains(target)) return; aura::Window* keyboard_container = root_controller->GetContainer( - internal::kShellWindowId_VirtualKeyboardContainer); + kShellWindowId_VirtualKeyboardContainer); if (keyboard_container->Contains(target)) return; } @@ -437,5 +435,4 @@ void AppListController::TransitionChanged() { } } -} // namespace internal } // namespace ash diff --git a/ash/wm/app_list_controller.h b/ash/wm/app_list_controller.h index 2e41758..c2eb0ad 100644 --- a/ash/wm/app_list_controller.h +++ b/ash/wm/app_list_controller.h @@ -33,8 +33,6 @@ namespace test { class AppListControllerTestApi; } -namespace internal { - // AppListController is a controller that manages app list UI for shell. // It creates AppListView and schedules showing/hiding animation. // While the UI is visible, it monitors things such as app list widget's @@ -139,7 +137,6 @@ class AppListController : public ui::EventHandler, DISALLOW_COPY_AND_ASSIGN(AppListController); }; -} // namespace internal } // namespace ash #endif // ASH_WM_APP_LIST_CONTROLLER_H_ diff --git a/ash/wm/app_list_controller_unittest.cc b/ash/wm/app_list_controller_unittest.cc index 7295c67..9808d8b 100644 --- a/ash/wm/app_list_controller_unittest.cc +++ b/ash/wm/app_list_controller_unittest.cc @@ -34,8 +34,7 @@ TEST_F(AppListControllerTest, RemainVisibleWhenFocusingToApplistContainer) { EXPECT_TRUE(Shell::GetInstance()->GetAppListTargetVisibility()); aura::Window* applist_container = Shell::GetContainer( - Shell::GetPrimaryRootWindow(), - internal::kShellWindowId_AppListContainer); + Shell::GetPrimaryRootWindow(), kShellWindowId_AppListContainer); scoped_ptr<aura::Window> window( aura::test::CreateTestWindowWithId(0, applist_container)); wm::ActivateWindow(window.get()); diff --git a/ash/wm/ash_focus_rules.cc b/ash/wm/ash_focus_rules.cc index efeaaca..c38c7d3 100644 --- a/ash/wm/ash_focus_rules.cc +++ b/ash/wm/ash_focus_rules.cc @@ -16,23 +16,22 @@ namespace { // These are the list of container ids of containers which may contain windows // that need to be activated in the order that they should be activated. const int kWindowContainerIds[] = { - internal::kShellWindowId_OverlayContainer, - internal::kShellWindowId_LockSystemModalContainer, - internal::kShellWindowId_SettingBubbleContainer, - internal::kShellWindowId_LockScreenContainer, - internal::kShellWindowId_SystemModalContainer, - internal::kShellWindowId_AlwaysOnTopContainer, - internal::kShellWindowId_AppListContainer, - internal::kShellWindowId_DefaultContainer, + kShellWindowId_OverlayContainer, + kShellWindowId_LockSystemModalContainer, + kShellWindowId_SettingBubbleContainer, + kShellWindowId_LockScreenContainer, + kShellWindowId_SystemModalContainer, + kShellWindowId_AlwaysOnTopContainer, + kShellWindowId_AppListContainer, + kShellWindowId_DefaultContainer, // Docked, panel, launcher and status are intentionally checked after other // containers even though these layers are higher. The user expects their // windows to be focused before these elements. - internal::kShellWindowId_DockedContainer, - internal::kShellWindowId_PanelContainer, - internal::kShellWindowId_ShelfContainer, - internal::kShellWindowId_StatusContainer, -}; + kShellWindowId_DockedContainer, + kShellWindowId_PanelContainer, + kShellWindowId_ShelfContainer, + kShellWindowId_StatusContainer, }; bool BelongsToContainerWithEqualOrGreaterId(const aura::Window* window, int container_id) { @@ -58,7 +57,7 @@ AshFocusRules::~AshFocusRules() { // AshFocusRules, ::wm::FocusRules: bool AshFocusRules::SupportsChildActivation(aura::Window* window) const { - if (window->id() == internal::kShellWindowId_DefaultContainer) + if (window->id() == kShellWindowId_DefaultContainer) return true; for (size_t i = 0; i < arraysize(kWindowContainerIds); i++) { @@ -78,9 +77,9 @@ bool AshFocusRules::IsWindowConsideredVisibleForActivation( if (wm::GetWindowState(window)->IsMinimized()) return true; - return window->TargetVisibility() && (window->parent()->id() == - internal::kShellWindowId_DefaultContainer || window->parent()->id() == - internal::kShellWindowId_LockScreenContainer); + return window->TargetVisibility() && + (window->parent()->id() == kShellWindowId_DefaultContainer || + window->parent()->id() == kShellWindowId_LockScreenContainer); } bool AshFocusRules::CanActivateWindow(aura::Window* window) const { @@ -93,7 +92,7 @@ bool AshFocusRules::CanActivateWindow(aura::Window* window) const { if (Shell::GetInstance()->IsSystemModalWindowOpen()) { return BelongsToContainerWithEqualOrGreaterId( - window, internal::kShellWindowId_SystemModalContainer); + window, kShellWindowId_SystemModalContainer); } return true; diff --git a/ash/wm/ash_native_cursor_manager_interactive_uitest.cc b/ash/wm/ash_native_cursor_manager_interactive_uitest.cc index 771b725..48d2af5 100644 --- a/ash/wm/ash_native_cursor_manager_interactive_uitest.cc +++ b/ash/wm/ash_native_cursor_manager_interactive_uitest.cc @@ -50,10 +50,10 @@ class AshNativeCursorManagerTest : public test::AshTestBase { namespace { -internal::DisplayInfo CreateDisplayInfo(int64 id, - const gfx::Rect& bounds, - float device_scale_factor) { - internal::DisplayInfo info(id, "", false); +DisplayInfo CreateDisplayInfo(int64 id, + const gfx::Rect& bounds, + float device_scale_factor) { + DisplayInfo info(id, "", false); info.SetBounds(bounds); info.set_device_scale_factor(device_scale_factor); return info; @@ -93,13 +93,12 @@ TEST_F(AshNativeCursorManagerTest, MAYBE_CursorChangeOnEnterNotify) { CursorManager* cursor_manager = Shell::GetInstance()->cursor_manager(); test::CursorManagerTestApi test_api(cursor_manager); - internal::DisplayManager* display_manager = - Shell::GetInstance()->display_manager(); - internal::DisplayInfo display_info1 = + DisplayManager* display_manager = Shell::GetInstance()->display_manager(); + DisplayInfo display_info1 = CreateDisplayInfo(10, gfx::Rect(0, 0, 500, 300), 1.0f); - internal::DisplayInfo display_info2 = + DisplayInfo display_info2 = CreateDisplayInfo(20, gfx::Rect(500, 0, 500, 300), 2.0f); - std::vector<internal::DisplayInfo> display_info_list; + std::vector<DisplayInfo> display_info_list; display_info_list.push_back(display_info1); display_info_list.push_back(display_info2); display_manager->OnNativeDisplaysChanged(display_info_list); diff --git a/ash/wm/boot_splash_screen_chromeos.cc b/ash/wm/boot_splash_screen_chromeos.cc index df57654..c9516d7 100644 --- a/ash/wm/boot_splash_screen_chromeos.cc +++ b/ash/wm/boot_splash_screen_chromeos.cc @@ -14,7 +14,6 @@ #include "ui/gfx/canvas.h" namespace ash { -namespace internal { // ui::LayerDelegate that copies the aura host window's content to a ui::Layer. class BootSplashScreen::CopyHostContentLayerDelegate @@ -72,5 +71,4 @@ void BootSplashScreen::StartHideAnimation(base::TimeDelta duration) { layer_->SetOpacity(0.0f); } -} // namespace internal } // namespace ash diff --git a/ash/wm/boot_splash_screen_chromeos.h b/ash/wm/boot_splash_screen_chromeos.h index 7ba2809..a127a51 100644 --- a/ash/wm/boot_splash_screen_chromeos.h +++ b/ash/wm/boot_splash_screen_chromeos.h @@ -21,7 +21,6 @@ class LayerDelegate; } namespace ash { -namespace internal { // BootSplashScreen manages a ui::Layer, stacked at the top of the root layer's // children, that displays a copy of the initial contents of the host window. @@ -47,7 +46,6 @@ class BootSplashScreen { DISALLOW_COPY_AND_ASSIGN(BootSplashScreen); }; -} // namespace internal } // namespace ash #endif // ASH_WM_BOOT_SPLASH_SCREEN_CHROMEOS_H_ diff --git a/ash/wm/default_state.cc b/ash/wm/default_state.cc index 354e99e..b5aec38 100644 --- a/ash/wm/default_state.cc +++ b/ash/wm/default_state.cc @@ -31,7 +31,7 @@ const float kMinimumPercentOnScreenArea = 0.3f; bool IsPanel(aura::Window* window) { return window->parent() && - window->parent()->id() == internal::kShellWindowId_PanelContainer; + window->parent()->id() == kShellWindowId_PanelContainer; } void MoveToDisplayForRestore(WindowState* window_state) { diff --git a/ash/wm/dock/dock_types.h b/ash/wm/dock/dock_types.h index e2ebaab..c203a67 100644 --- a/ash/wm/dock/dock_types.h +++ b/ash/wm/dock/dock_types.h @@ -7,8 +7,6 @@ namespace ash { -namespace internal { - // Possible values of which side of the screen the windows are docked at. // This is used by DockedwindowLayoutManager and DockedWindowResizer to // implement docking behavior including magnetism while dragging windows into @@ -49,7 +47,6 @@ enum DockedActionSource { DOCKED_ACTION_SOURCE_COUNT, }; -} // namespace internal } // namespace ash #endif // ASH_WM_DOCK_DOCK_TYPES_H_ diff --git a/ash/wm/dock/docked_window_layout_manager.cc b/ash/wm/dock/docked_window_layout_manager.cc index 04273e1b..add93f4 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 diff --git a/ash/wm/dock/docked_window_layout_manager.h b/ash/wm/dock/docked_window_layout_manager.h index 18569d8..030d888 100644 --- a/ash/wm/dock/docked_window_layout_manager.h +++ b/ash/wm/dock/docked_window_layout_manager.h @@ -38,12 +38,10 @@ class Widget; } namespace ash { -class Shelf; - -namespace internal { class DockedBackgroundWidget; class DockedWindowLayoutManagerObserver; class DockedWindowResizerTest; +class Shelf; class ShelfLayoutManager; class WorkspaceController; @@ -310,7 +308,6 @@ class ASH_EXPORT DockedWindowLayoutManager DISALLOW_COPY_AND_ASSIGN(DockedWindowLayoutManager); }; -} // namespace internal } // namespace ash #endif // ASH_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_ diff --git a/ash/wm/dock/docked_window_layout_manager_observer.h b/ash/wm/dock/docked_window_layout_manager_observer.h index f529753..69839d1 100644 --- a/ash/wm/dock/docked_window_layout_manager_observer.h +++ b/ash/wm/dock/docked_window_layout_manager_observer.h @@ -12,7 +12,6 @@ class Rect; } namespace ash { -namespace internal { // Observers to the DockedWindowLayoutManager are notified of significant // events that occur with the docked windows, such as the bounds change. @@ -35,7 +34,6 @@ class ASH_EXPORT DockedWindowLayoutManagerObserver { virtual ~DockedWindowLayoutManagerObserver() {} }; -} // namespace internal } // namespace ash #endif // UI_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_OBSERVER_H_ diff --git a/ash/wm/dock/docked_window_layout_manager_unittest.cc b/ash/wm/dock/docked_window_layout_manager_unittest.cc index 0d74301..48db154 100644 --- a/ash/wm/dock/docked_window_layout_manager_unittest.cc +++ b/ash/wm/dock/docked_window_layout_manager_unittest.cc @@ -35,7 +35,6 @@ #include "ui/views/widget/widget.h" namespace ash { -namespace internal { class DockedWindowLayoutManagerTest : public test::AshTestBase, @@ -101,7 +100,7 @@ class DockedWindowLayoutManagerTest aura::Window* GetPanelContainer(aura::Window* panel) { return Shell::GetContainer(panel->GetRootWindow(), - internal::kShellWindowId_PanelContainer); + kShellWindowId_PanelContainer); } static WindowResizer* CreateSomeWindowResizer( @@ -149,8 +148,8 @@ class DockedWindowLayoutManagerTest // parent. int CorrectContainerIdDuringDrag() { if (window_type_ == ui::wm::WINDOW_TYPE_PANEL) - return internal::kShellWindowId_PanelContainer; - return internal::kShellWindowId_DockedContainer; + return kShellWindowId_PanelContainer; + return kShellWindowId_DockedContainer; } // Test dragging the window vertically (to detach if it is a panel) and then @@ -202,7 +201,7 @@ class DockedWindowLayoutManagerTest // x-coordinate can get adjusted by snapping or sticking. // y-coordinate could be changed by possible automatic layout if docked. - if (window->parent()->id() != internal::kShellWindowId_DockedContainer && + if (window->parent()->id() != kShellWindowId_DockedContainer && !wm::GetWindowState(window)->HasRestoreBounds()) { EXPECT_EQ(initial_bounds.y() + dy, window->GetBoundsInScreen().y()); } @@ -234,7 +233,7 @@ TEST_P(DockedWindowLayoutManagerTest, AddOneWindow) { EXPECT_EQ(window->GetRootWindow()->bounds().right(), window->GetBoundsInScreen().right()); EXPECT_EQ(ideal_width(), window->bounds().width()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id()); } // Tests that with a window docked on the left the auto-placing logic in @@ -250,7 +249,7 @@ TEST_P(DockedWindowLayoutManagerTest, AutoPlacingLeft) { // The window should be attached and snapped to the right side of the screen. EXPECT_EQ(window->GetRootWindow()->bounds().x(), window->GetBoundsInScreen().x()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id()); DockedWindowLayoutManager* manager = static_cast<DockedWindowLayoutManager*>( window->parent()->layout_manager()); @@ -300,7 +299,7 @@ TEST_P(DockedWindowLayoutManagerTest, AutoPlacingRight) { // The window should be attached and snapped to the right side of the screen. EXPECT_EQ(window->GetRootWindow()->bounds().right(), window->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id()); DockedWindowLayoutManager* manager = static_cast<DockedWindowLayoutManager*>( window->parent()->layout_manager()); @@ -354,7 +353,7 @@ TEST_P(DockedWindowLayoutManagerTest, AutoPlacingRightSecondScreen) { // The window should be attached and snapped to the right side of the screen. EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().right(), window->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id()); DockedWindowLayoutManager* manager = static_cast<DockedWindowLayoutManager*>( window->parent()->layout_manager()); @@ -405,10 +404,10 @@ TEST_P(DockedWindowLayoutManagerTest, AddTwoWindows) { // The windows should be attached and snapped to the right side of the screen. EXPECT_EQ(w1->GetRootWindow()->bounds().right(), w1->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); EXPECT_EQ(w2->GetRootWindow()->bounds().right(), w2->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w2->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w2->parent()->id()); // Test that the gaps differ at most by a single pixel. gfx::Rect work_area = @@ -434,10 +433,10 @@ TEST_P(DockedWindowLayoutManagerTest, TwoWindowsDragging) { // The windows should be attached and snapped to the right side of the screen. EXPECT_EQ(w1->GetRootWindow()->bounds().right(), w1->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); EXPECT_EQ(w2->GetRootWindow()->bounds().right(), w2->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w2->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w2->parent()->id()); // Drag w2 above w1. ASSERT_NO_FATAL_FAILURE(DragStartAtOffsetFromwindowOrigin(w2.get(), 0, 20)); @@ -471,13 +470,13 @@ TEST_P(DockedWindowLayoutManagerTest, ThreeWindowsDragging) { // All windows should be attached and snapped to the right side of the screen. EXPECT_EQ(w1->GetRootWindow()->bounds().right(), w1->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); EXPECT_EQ(w2->GetRootWindow()->bounds().right(), w2->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w2->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w2->parent()->id()); EXPECT_EQ(w3->GetRootWindow()->bounds().right(), w3->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w3->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w3->parent()->id()); // Test that the top and bottom windows are clamped in work area and // that the gaps between the windows differ at most by a pixel. @@ -540,13 +539,13 @@ TEST_P(DockedWindowLayoutManagerTest, ThreeWindowsDraggingSecondScreen) { // All windows should be attached and snapped to the right side of the screen. EXPECT_EQ(w1->GetRootWindow()->bounds().right(), w1->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); EXPECT_EQ(w2->GetRootWindow()->bounds().right(), w2->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w2->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w2->parent()->id()); EXPECT_EQ(w3->GetRootWindow()->bounds().right(), w3->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w3->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w3->parent()->id()); gfx::Rect work_area = Shell::GetScreen()->GetDisplayNearestWindow(w1.get()).work_area(); @@ -685,7 +684,7 @@ TEST_P(DockedWindowLayoutManagerTest, WidthMoreThanMax) { // The window should not get docked even though it is dragged past the edge. EXPECT_NE(window->GetRootWindow()->bounds().right(), window->GetBoundsInScreen().right()); - EXPECT_NE(internal::kShellWindowId_DockedContainer, window->parent()->id()); + EXPECT_NE(kShellWindowId_DockedContainer, window->parent()->id()); } // Docks three windows and tests that the very first window gets minimized. @@ -703,16 +702,16 @@ TEST_P(DockedWindowLayoutManagerTest, ThreeWindowsMinimize) { // The last two windows should be attached and snapped to the right edge. EXPECT_EQ(w2->GetRootWindow()->bounds().right(), w2->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w2->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w2->parent()->id()); EXPECT_EQ(w3->GetRootWindow()->bounds().right(), w3->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w3->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w3->parent()->id()); // The first window should get minimized but parented by the dock container. EXPECT_TRUE(wm::GetWindowState(w1.get())->IsMinimized()); EXPECT_TRUE(wm::GetWindowState(w2.get())->IsNormalStateType()); EXPECT_TRUE(wm::GetWindowState(w3.get())->IsNormalStateType()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); } // Docks up to three windows and tests that they split vertical space. @@ -729,10 +728,10 @@ TEST_P(DockedWindowLayoutManagerTest, ThreeWindowsSplitHeightEvenly) { // The two windows should be attached and snapped to the right edge. EXPECT_EQ(w1->GetRootWindow()->bounds().right(), w1->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); EXPECT_EQ(w2->GetRootWindow()->bounds().right(), w2->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w2->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w2->parent()->id()); // The two windows should be same size vertically and almost 1/2 of work area. gfx::Rect work_area = @@ -748,9 +747,9 @@ TEST_P(DockedWindowLayoutManagerTest, ThreeWindowsSplitHeightEvenly) { DragToVerticalPositionAndToEdge(DOCKED_EDGE_RIGHT, w3.get(), 300); // All three windows should be docked and snapped to the right edge. - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w2->parent()->id()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w3->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w2->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w3->parent()->id()); // All windows should be near same size vertically and about 1/3 of work area. EXPECT_NEAR(w1->GetBoundsInScreen().height(), @@ -786,10 +785,10 @@ TEST_P(DockedWindowLayoutManagerTest, TwoWindowsHeightRestrictions) { // The two windows should be attached and snapped to the right edge. EXPECT_EQ(w1->GetRootWindow()->bounds().right(), w1->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); EXPECT_EQ(w2->GetRootWindow()->bounds().right(), w2->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w2->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w2->parent()->id()); // The two windows should have their heights restricted. EXPECT_EQ(300, w1->GetBoundsInScreen().height()); @@ -824,7 +823,7 @@ TEST_P(DockedWindowLayoutManagerTest, DisplayDisconnectionMovesDocked) { // Its height should grow to match the new work area. EXPECT_EQ(window->GetRootWindow()->bounds().right(), window->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id()); EXPECT_EQ(ideal_width(), window->bounds().width()); gfx::Rect work_area = Shell::GetScreen()->GetDisplayNearestWindow(window.get()).work_area(); @@ -836,5 +835,5 @@ INSTANTIATE_TEST_CASE_P(NormalOrPanel, DockedWindowLayoutManagerTest, testing::Values(ui::wm::WINDOW_TYPE_NORMAL, ui::wm::WINDOW_TYPE_PANEL)); -} // namespace internal + } // namespace ash diff --git a/ash/wm/dock/docked_window_resizer.cc b/ash/wm/dock/docked_window_resizer.cc index 9f3efae..d6f04d0 100644 --- a/ash/wm/dock/docked_window_resizer.cc +++ b/ash/wm/dock/docked_window_resizer.cc @@ -32,8 +32,6 @@ #include "ui/views/widget/widget.h" namespace ash { -namespace internal { - namespace { DockedWindowLayoutManager* GetDockedLayoutManagerAtPoint( @@ -320,5 +318,4 @@ DockedAction DockedWindowResizer::MaybeReparentWindowOnDragCompletion( return action; } -} // namespace internal } // namespace ash diff --git a/ash/wm/dock/docked_window_resizer.h b/ash/wm/dock/docked_window_resizer.h index 7797424..da62e2a 100644 --- a/ash/wm/dock/docked_window_resizer.h +++ b/ash/wm/dock/docked_window_resizer.h @@ -21,8 +21,6 @@ class RootWindow; } namespace ash { -namespace internal { - class DockedWindowLayoutManager; // DockWindowResizer is used by ToplevelWindowEventFilter to handle dragging, @@ -77,8 +75,8 @@ class ASH_EXPORT DockedWindowResizer : public WindowResizer { scoped_ptr<WindowResizer> next_window_resizer_; // Dock container window. - internal::DockedWindowLayoutManager* dock_layout_; - internal::DockedWindowLayoutManager* initial_dock_layout_; + DockedWindowLayoutManager* dock_layout_; + DockedWindowLayoutManager* initial_dock_layout_; // Set to true once Drag() is invoked and the bounds of the window change. bool did_move_or_resize_; @@ -98,7 +96,6 @@ class ASH_EXPORT DockedWindowResizer : public WindowResizer { DISALLOW_COPY_AND_ASSIGN(DockedWindowResizer); }; -} // namespace internal } // namespace ash #endif // ASH_WM_DOCK_DOCK_WINDOW_RESIZER_H_ diff --git a/ash/wm/dock/docked_window_resizer_unittest.cc b/ash/wm/dock/docked_window_resizer_unittest.cc index 65f7658..82489dc 100644 --- a/ash/wm/dock/docked_window_resizer_unittest.cc +++ b/ash/wm/dock/docked_window_resizer_unittest.cc @@ -37,7 +37,6 @@ #include "ui/wm/core/window_util.h" namespace ash { -namespace internal { class DockedWindowResizerTest : public test::AshTestBase, @@ -83,11 +82,9 @@ class DockedWindowResizerTest test::TestShelfDelegate* shelf_delegate = test::TestShelfDelegate::instance(); shelf_delegate->AddShelfItem(window); - PanelLayoutManager* manager = - static_cast<PanelLayoutManager*>( - Shell::GetContainer(window->GetRootWindow(), - internal::kShellWindowId_PanelContainer)-> - layout_manager()); + PanelLayoutManager* manager = static_cast<PanelLayoutManager*>( + Shell::GetContainer(window->GetRootWindow(), + kShellWindowId_PanelContainer)->layout_manager()); manager->Relayout(); } return window; @@ -170,8 +167,8 @@ class DockedWindowResizerTest // during drags. int CorrectContainerIdDuringDrag() { if (window_type_ == ui::wm::WINDOW_TYPE_PANEL) - return internal::kShellWindowId_PanelContainer; - return internal::kShellWindowId_DockedContainer; + return kShellWindowId_PanelContainer; + return kShellWindowId_DockedContainer; } // Test dragging the window vertically (to detach if it is a panel) and then @@ -232,7 +229,7 @@ class DockedWindowResizerTest // x-coordinate can get adjusted by snapping or sticking. // y-coordinate could be changed by possible automatic layout if docked. - if (window->parent()->id() != internal::kShellWindowId_DockedContainer && + if (window->parent()->id() != kShellWindowId_DockedContainer && !wm::GetWindowState(window)->HasRestoreBounds()) { EXPECT_EQ(initial_bounds.y() + dy, window->GetBoundsInScreen().y()); } @@ -271,7 +268,7 @@ TEST_P(DockedWindowResizerTest, AttachRightPrecise) { // The window should be docked at the right edge. EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().right(), window->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id()); } // Verifies a window can be dragged and attached to the dock @@ -286,7 +283,7 @@ TEST_P(DockedWindowResizerTest, AttachRightOvershoot) { // The window should be docked at the right edge. EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().right(), window->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id()); } // Verifies a window can be dragged and then if a pointer is not quite reaching @@ -312,8 +309,7 @@ TEST_P(DockedWindowResizerTest, AttachRightUndershoot) { EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().right() + window->bounds().width() - kGrabOffsetX - kUndershootBy - 1, window->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, - window->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, window->parent()->id()); } // Verifies a window can be dragged and attached to the dock. @@ -327,7 +323,7 @@ TEST_P(DockedWindowResizerTest, AttachLeftPrecise) { // The window should be docked at the left edge. EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().x(), window->GetBoundsInScreen().x()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id()); } // Verifies a window can be dragged and attached to the dock @@ -342,7 +338,7 @@ TEST_P(DockedWindowResizerTest, AttachLeftOvershoot) { // The window should be docked at the left edge. EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().x(), window->GetBoundsInScreen().x()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id()); } // Verifies a window can be dragged and then if a pointer is not quite reaching @@ -358,8 +354,7 @@ TEST_P(DockedWindowResizerTest, AttachLeftUndershoot) { // The window should be crossing the screen edge but not docked. int expected_x = initial_bounds.x() - initial_location_in_parent().x() + 1; EXPECT_EQ(expected_x, window->GetBoundsInScreen().x()); - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, - window->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, window->parent()->id()); } // Dock on the right side, change shelf alignment, check that windows move to @@ -374,7 +369,7 @@ TEST_P(DockedWindowResizerTest, AttachRightChangeShelf) { // The window should be docked at the right edge. EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().right(), window->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id()); // set launcher shelf to be aligned on the right ash::Shell* shell = ash::Shell::GetInstance(); @@ -383,7 +378,7 @@ TEST_P(DockedWindowResizerTest, AttachRightChangeShelf) { // The window should have moved and get attached to the left dock. EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().x(), window->GetBoundsInScreen().x()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id()); // set launcher shelf to be aligned on the left shell->SetShelfAlignment(SHELF_ALIGNMENT_LEFT, @@ -391,7 +386,7 @@ TEST_P(DockedWindowResizerTest, AttachRightChangeShelf) { // The window should have moved and get attached to the right edge. EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().right(), window->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id()); // set launcher shelf to be aligned at the bottom shell->SetShelfAlignment(SHELF_ALIGNMENT_BOTTOM, @@ -399,7 +394,7 @@ TEST_P(DockedWindowResizerTest, AttachRightChangeShelf) { // The window should stay in the right edge. EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().right(), window->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id()); } // Dock on the right side, try to undock, then drag more to really undock @@ -416,7 +411,7 @@ TEST_P(DockedWindowResizerTest, AttachTryDetach) { EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().right(), window->GetBoundsInScreen().right()); EXPECT_EQ(ideal_width(), window->GetBoundsInScreen().width()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id()); // Try to detach by dragging left less than kSnapToDockDistance. // The window should stay docked. @@ -429,7 +424,7 @@ TEST_P(DockedWindowResizerTest, AttachTryDetach) { // The window should be still attached to the right edge. EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().right(), window->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id()); // Try to detach by dragging left by kSnapToDockDistance or more. // The window should get undocked. @@ -442,8 +437,7 @@ TEST_P(DockedWindowResizerTest, AttachTryDetach) { // The window should be floating on the desktop again and moved to the left. EXPECT_EQ(left_edge - 32, window->GetBoundsInScreen().x()); - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, - window->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, window->parent()->id()); } // Dock on the right side, and undock by dragging the right edge of the window @@ -463,7 +457,7 @@ TEST_P(DockedWindowResizerTest, AttachTryDetachDragRightEdgeOfHeader) { EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().right(), window->GetBoundsInScreen().right()); EXPECT_EQ(ideal_width(), window->GetBoundsInScreen().width()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id()); // Try to detach by dragging left less than kSnapToDockDistance. // The window should stay docked. @@ -476,7 +470,7 @@ TEST_P(DockedWindowResizerTest, AttachTryDetachDragRightEdgeOfHeader) { // The window should be still attached to the right edge. EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().right(), window->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id()); // Try to detach by dragging left by kSnapToDockDistance or more. // The window should get undocked. @@ -489,8 +483,7 @@ TEST_P(DockedWindowResizerTest, AttachTryDetachDragRightEdgeOfHeader) { // The window should be floating on the desktop again and moved to the left. EXPECT_EQ(left_edge - 32, window->GetBoundsInScreen().x()); - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, - window->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, window->parent()->id()); } // Minimize a docked window, then restore it and check that it is still docked. @@ -504,7 +497,7 @@ TEST_P(DockedWindowResizerTest, AttachMinimizeRestore) { // The window should be docked at the right edge. EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().right(), window->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id()); wm::WindowState* window_state = wm::GetWindowState(window.get()); // Minimize the window, it should be hidden. @@ -530,7 +523,7 @@ TEST_P(DockedWindowResizerTest, AttachMaximize) { // The window should be docked at the right edge. EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().right(), window->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id()); wm::WindowState* window_state = wm::GetWindowState(window.get()); // Maximize the window, it should get undocked and maximized in a desktop. @@ -538,7 +531,7 @@ TEST_P(DockedWindowResizerTest, AttachMaximize) { RunAllPendingInMessageLoop(); EXPECT_TRUE(window->IsVisible()); EXPECT_TRUE(window_state->IsMaximized()); - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, window->parent()->id()); } // Dock two windows, undock one, check that the other one is still docked. @@ -559,11 +552,11 @@ TEST_P(DockedWindowResizerTest, AttachTwoWindows) { // Both windows should be docked at the right edge. EXPECT_EQ(w1->GetRootWindow()->GetBoundsInScreen().right(), w1->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); EXPECT_EQ(w2->GetRootWindow()->GetBoundsInScreen().right(), w2->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w2->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w2->parent()->id()); // Detach by dragging left (should get undocked). const int left_edge = w2->bounds().x(); @@ -577,12 +570,11 @@ TEST_P(DockedWindowResizerTest, AttachTwoWindows) { EXPECT_FALSE(window_state1->IsMinimized()); EXPECT_EQ(w1->GetRootWindow()->GetBoundsInScreen().right(), w1->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); // The window should be floating on the desktop again and moved to the left. EXPECT_EQ(left_edge - 32, w2->GetBoundsInScreen().x()); - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, - w2->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, w2->parent()->id()); } // Create two windows, dock one and change shelf to auto-hide. @@ -596,12 +588,12 @@ TEST_P(DockedWindowResizerTest, AttachOneAutoHideShelf) { // w1 should be docked at the right edge. EXPECT_EQ(w1->GetRootWindow()->GetBoundsInScreen().right(), w1->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); scoped_ptr<aura::Window> w2(CreateTestWindowInShellWithDelegateAndType( NULL, ui::wm::WINDOW_TYPE_NORMAL, 0, gfx::Rect(20, 20, 150, 20))); wm::GetWindowState(w2.get())->Maximize(); - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, w2->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, w2->parent()->id()); EXPECT_TRUE(wm::GetWindowState(w2.get())->IsMaximized()); gfx::Rect work_area = @@ -641,14 +633,14 @@ TEST_P(DockedWindowResizerTest, AttachOnTwoSides) { // The first window should be docked at the right edge. EXPECT_EQ(w1->GetRootWindow()->GetBoundsInScreen().right(), w1->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); // The second window should be near the left edge but not snapped. // Normal window will get side-maximized while panels will not. int expected_x = test_panels() ? (initial_bounds.x() - initial_location_in_parent().x()) : 0; EXPECT_EQ(expected_x, w2->GetBoundsInScreen().x()); - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, w2->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, w2->parent()->id()); } // Tests that reverting a drag restores docked state if a window was docked. @@ -662,20 +654,19 @@ TEST_P(DockedWindowResizerTest, RevertDragRestoresAttachment) { // The window should be docked at the right edge. EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().right(), window->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id()); // Drag the window out but revert the drag ASSERT_NO_FATAL_FAILURE(DragStart(window.get())); DragMove(-50, 0); DragRevert(); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id()); // Detach window. ASSERT_NO_FATAL_FAILURE(DragStart(window.get())); DragMove(-50, 0); DragEnd(); - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, - window->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, window->parent()->id()); } // Tests that reverting drag restores undocked state if a window was not docked. @@ -739,7 +730,7 @@ TEST_P(DockedWindowResizerTest, DragAcrossDisplays) { // The window should be docked at the right edge. EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().right(), window->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id()); // Try dragging to the right - enough to get it peeking at the other screen // but not enough to land in the other screen. @@ -750,8 +741,7 @@ TEST_P(DockedWindowResizerTest, DragAcrossDisplays) { DragEnd(); EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().right(), window->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, - window->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id()); EXPECT_EQ(root_windows[0], window->GetRootWindow()); // Undock and move to the right - enough to get the mouse pointer past the @@ -766,8 +756,7 @@ TEST_P(DockedWindowResizerTest, DragAcrossDisplays) { DragEnd(); EXPECT_NE(window->GetRootWindow()->GetBoundsInScreen().right(), window->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, - window->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, window->parent()->id()); EXPECT_EQ(root_windows[1], window->GetRootWindow()); // Keep dragging it to the right until its left edge touches the screen edge. @@ -783,7 +772,7 @@ TEST_P(DockedWindowResizerTest, DragAcrossDisplays) { DragEnd(); EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().x(), window->GetBoundsInScreen().x()); - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, window->parent()->id()); EXPECT_EQ(root_windows[1], window->GetRootWindow()); } @@ -804,7 +793,7 @@ TEST_P(DockedWindowResizerTest, AttachTwoWindowsDetachOne) { // A window should be docked at the right edge. EXPECT_EQ(w1->GetRootWindow()->GetBoundsInScreen().right(), w1->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); DockedWindowLayoutManager* manager = static_cast<DockedWindowLayoutManager*>(w1->parent()->layout_manager()); EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager)); @@ -814,7 +803,7 @@ TEST_P(DockedWindowResizerTest, AttachTwoWindowsDetachOne) { // Both windows should now be docked at the right edge. EXPECT_EQ(w2->GetRootWindow()->GetBoundsInScreen().right(), w2->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w2->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w2->parent()->id()); // Dock width should be set to a wider window. EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager)); EXPECT_EQ(std::max(w1->bounds().width(), w2->bounds().width()), @@ -833,12 +822,12 @@ TEST_P(DockedWindowResizerTest, AttachTwoWindowsDetachOne) { // The first window should be still docked. EXPECT_EQ(w1->GetRootWindow()->GetBoundsInScreen().right(), w1->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); // The second window should be still docked. EXPECT_EQ(w2->GetRootWindow()->GetBoundsInScreen().right(), w2->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w2->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w2->parent()->id()); // Detach by dragging left more (should get undocked). const int left_edge = w2->bounds().x(); @@ -854,9 +843,9 @@ TEST_P(DockedWindowResizerTest, AttachTwoWindowsDetachOne) { // The second window should be floating on the desktop again. EXPECT_EQ(left_edge + drag_x, w2->bounds().x()); - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, w2->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, w2->parent()->id()); // Dock width should be set to remaining single docked window. - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager)); EXPECT_EQ(w1->bounds().width(), docked_width(manager)); } @@ -876,7 +865,7 @@ TEST_P(DockedWindowResizerTest, AttachWindowMaximizeOther) { // A window should be docked at the right edge. EXPECT_EQ(w1->GetRootWindow()->GetBoundsInScreen().right(), w1->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); DockedWindowLayoutManager* manager = static_cast<DockedWindowLayoutManager*>(w1->parent()->layout_manager()); EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager)); @@ -892,15 +881,15 @@ TEST_P(DockedWindowResizerTest, AttachWindowMaximizeOther) { // The first window should be still docked. EXPECT_EQ(w1->GetRootWindow()->GetBoundsInScreen().right(), w1->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); // The second window should be floating on the desktop. EXPECT_EQ(w2->GetRootWindow()->GetBoundsInScreen().right() - (w2->bounds().width()/2 + 20), w2->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, w2->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, w2->parent()->id()); // Dock width should be set to remaining single docked window. - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager)); EXPECT_EQ(w1->bounds().width(), docked_width(manager)); // Desktop work area should now shrink. @@ -926,8 +915,8 @@ TEST_P(DockedWindowResizerTest, AttachWindowMaximizeOther) { DragEnd(); EXPECT_EQ(DOCKED_ALIGNMENT_NONE, docked_alignment(manager)); // Dock should get shrunk and desktop should get expanded. - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, w1->parent()->id()); - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, w2->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, w2->parent()->id()); EXPECT_EQ(DOCKED_ALIGNMENT_NONE, docked_alignment(manager)); EXPECT_EQ(0, docked_width(manager)); // The second window should now get resized and take up the whole screen. @@ -944,11 +933,11 @@ TEST_P(DockedWindowResizerTest, AttachWindowMaximizeOther) { // Release the mouse and the window should be now attached to the edge. DragEnd(); // Dock should get expanded and desktop should get shrunk. - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); EXPECT_EQ(DOCKED_ALIGNMENT_LEFT, docked_alignment(manager)); EXPECT_EQ(w1->bounds().width(), docked_width(manager)); // Second window should still be in the desktop. - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, w2->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, w2->parent()->id()); // Maximized window should be shrunk. EXPECT_EQ(ScreenUtil::GetDisplayBoundsInParent(w2.get()).width() - docked_width(manager) - min_dock_gap(), @@ -975,14 +964,14 @@ TEST_P(DockedWindowResizerTest, AttachOneTestSticky) { // A window should be docked at the left edge. EXPECT_EQ(w1->GetRootWindow()->GetBoundsInScreen().x(), w1->GetBoundsInScreen().x()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); DockedWindowLayoutManager* manager = static_cast<DockedWindowLayoutManager*>(w1->parent()->layout_manager()); // The first window should be docked. EXPECT_EQ(w1->GetRootWindow()->GetBoundsInScreen().x(), w1->GetBoundsInScreen().x()); // Dock width should be set to that of a single docked window. - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); EXPECT_EQ(DOCKED_ALIGNMENT_LEFT, docked_alignment(manager)); EXPECT_EQ(w1->bounds().width(), docked_width(manager)); @@ -996,9 +985,9 @@ TEST_P(DockedWindowResizerTest, AttachOneTestSticky) { EXPECT_EQ(w2->GetRootWindow()->GetBoundsInScreen().x() + (w1->bounds().right() + 20), w2->GetBoundsInScreen().x()); - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, w2->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, w2->parent()->id()); // Dock width should be set to that of a single docked window. - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); EXPECT_EQ(DOCKED_ALIGNMENT_LEFT, docked_alignment(manager)); EXPECT_EQ(w1->bounds().width(), docked_width(manager)); @@ -1013,8 +1002,8 @@ TEST_P(DockedWindowResizerTest, AttachOneTestSticky) { EXPECT_EQ(DOCKED_ALIGNMENT_LEFT, docked_alignment(manager)); EXPECT_EQ(w1->bounds().width(), docked_width(manager)); // The second window should still be in the desktop. - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, w2->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, w2->parent()->id()); // Drag w2 by a bit more - it should resist the drag (stuck edges) int start_x = w2->bounds().x(); @@ -1032,8 +1021,8 @@ TEST_P(DockedWindowResizerTest, AttachOneTestSticky) { EXPECT_EQ(DOCKED_ALIGNMENT_LEFT, docked_alignment(manager)); EXPECT_EQ(w1->bounds().width(), docked_width(manager)); // The second window should still be in the desktop - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, w2->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, w2->parent()->id()); // Drag w2 by more than the stuck threshold and drop it into the dock. ASSERT_NO_FATAL_FAILURE(DragStart(w2.get())); @@ -1045,8 +1034,8 @@ TEST_P(DockedWindowResizerTest, AttachOneTestSticky) { // Release the mouse and the window should be attached to the edge. DragEnd(); // Both windows are docked now. - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w2->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w2->parent()->id()); // Dock should get expanded and desktop should get shrunk. EXPECT_EQ(DOCKED_ALIGNMENT_LEFT, docked_alignment(manager)); EXPECT_EQ(std::max(w1->bounds().width(), w2->bounds().width()), @@ -1075,7 +1064,7 @@ TEST_P(DockedWindowResizerTest, ResizeOneOfTwoWindows) { // A window should be docked at the right edge. EXPECT_EQ(w1->GetRootWindow()->GetBoundsInScreen().right(), w1->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); DockedWindowLayoutManager* manager = static_cast<DockedWindowLayoutManager*>(w1->parent()->layout_manager()); EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager)); @@ -1085,7 +1074,7 @@ TEST_P(DockedWindowResizerTest, ResizeOneOfTwoWindows) { // Both windows should now be docked at the right edge. EXPECT_EQ(w2->GetRootWindow()->GetBoundsInScreen().right(), w2->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w2->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w2->parent()->id()); // Dock width should be set to a wider window. EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager)); EXPECT_EQ(std::max(w1->bounds().width(), w2->bounds().width()), @@ -1103,8 +1092,8 @@ TEST_P(DockedWindowResizerTest, ResizeOneOfTwoWindows) { // Release the mouse and the window should be attached to the edge. DragEnd(); // Dock should still have both windows in it. - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w2->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w2->parent()->id()); EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager)); // w1 is now wider than before. The dock should expand and be as wide as w1. EXPECT_EQ(previous_width + kResizeSpan1, w1->bounds().width()); @@ -1129,8 +1118,8 @@ TEST_P(DockedWindowResizerTest, ResizeOneOfTwoWindows) { // Release the mouse and the window should be attached to the edge. DragEnd(); // Dock should still have both windows in it. - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w2->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w2->parent()->id()); EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager)); // w1 is now as wide as the maximum dock width and the dock should get // resized to the maximum width. @@ -1155,8 +1144,8 @@ TEST_P(DockedWindowResizerTest, ResizeOneOfTwoWindows) { // Release the mouse and the window should be docked. DragEnd(); // Dock should still have both windows in it. - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w2->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w2->parent()->id()); EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager)); // w1 should be narrower than before by the length of the drag. EXPECT_EQ(previous_width - kResizeSpan3, w1->bounds().width()); @@ -1177,7 +1166,7 @@ TEST_P(DockedWindowResizerTest, ResizeOneOfTwoWindows) { DragMove(-kResizeSpan3, 0); DragEnd(); EXPECT_EQ(previous_width + kResizeSpan3, w1->bounds().width()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); // Docked area should be as wide as possible (maximum) and same as w1. EXPECT_EQ(max_width(), docked_width(manager)); EXPECT_EQ(w1->bounds().width(), docked_width(manager)); @@ -1190,13 +1179,13 @@ TEST_P(DockedWindowResizerTest, ResizeOneOfTwoWindows) { EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager)); // Release the mouse and the window should be no longer attached to the edge. DragEnd(); - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, w1->parent()->id()); // Dock should be as wide as w2 (and same as ideal width). EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager)); EXPECT_EQ(ideal_width(), docked_width(manager)); EXPECT_EQ(w2->bounds().width(), docked_width(manager)); // The second window should be still docked. - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w2->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w2->parent()->id()); // Desktop work area should be inset. EXPECT_EQ(ScreenUtil::GetDisplayBoundsInParent(w1.get()).width() - docked_width(manager) - min_dock_gap(), @@ -1216,7 +1205,7 @@ TEST_P(DockedWindowResizerTest, ResizingKeepsWidth) { // Window should be docked at the right edge. EXPECT_EQ(w1->GetRootWindow()->GetBoundsInScreen().right(), w1->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); DockedWindowLayoutManager* manager = static_cast<DockedWindowLayoutManager*>(w1->parent()->layout_manager()); EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager)); @@ -1235,7 +1224,7 @@ TEST_P(DockedWindowResizerTest, ResizingKeepsWidth) { // Release the mouse and the window should be attached to the edge. DragEnd(); // The window should get docked. - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager)); // w1 is now wider and the dock should expand to be as wide as w1. EXPECT_EQ(previous_width + kResizeSpan1, w1->bounds().width()); @@ -1274,7 +1263,7 @@ TEST_P(DockedWindowResizerTest, ResizingKeepsDockedState) { // Window should be docked at the right edge. EXPECT_EQ(w1->GetRootWindow()->GetBoundsInScreen().right(), w1->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); DockedWindowLayoutManager* manager = static_cast<DockedWindowLayoutManager*>(w1->parent()->layout_manager()); EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager)); @@ -1293,7 +1282,7 @@ TEST_P(DockedWindowResizerTest, ResizingKeepsDockedState) { // Release the mouse and the window should be attached to the edge. DragEnd(); // The window should stay docked. - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager)); // w1 is now wider and the dock should expand to be as wide as w1. EXPECT_EQ(previous_width + kResizeSpan1, w1->bounds().width()); @@ -1312,7 +1301,7 @@ TEST_P(DockedWindowResizerTest, ResizingKeepsDockedState) { // Release the mouse and the window should be attached to the edge. DragEnd(); // The window should stay docked. - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager)); // The dock should stay as wide as w1 is now (a bit less than before). EXPECT_EQ(previous_width - kResizeSpan2, w1->bounds().width()); @@ -1332,8 +1321,8 @@ TEST_P(DockedWindowResizerTest, ResizeTwoWindows) { DragToVerticalPositionAndToEdge(DOCKED_EDGE_RIGHT, w1.get(), 20); DragToVerticalPositionAndToEdge(DOCKED_EDGE_RIGHT, w2.get(), 100); // Both windows should now be docked at the right edge. - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w2->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w2->parent()->id()); // Dock width should be set to ideal width. DockedWindowLayoutManager* manager = static_cast<DockedWindowLayoutManager*>(w1->parent()->layout_manager()); @@ -1369,9 +1358,9 @@ TEST_P(DockedWindowResizerTest, ResizeTwoWindows) { // Undock w2 and then dock it back. DragToVerticalPositionRelativeToEdge(DOCKED_EDGE_RIGHT, w2.get(), -400, 100); - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, w2->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, w2->parent()->id()); DragToVerticalPositionAndToEdge(DOCKED_EDGE_RIGHT, w2.get(), 100); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w2->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w2->parent()->id()); // w2 should become same width as w1. EXPECT_EQ(w1->bounds().width(), w2->bounds().width()); EXPECT_EQ(w1->bounds().width(), docked_width(manager)); @@ -1403,7 +1392,7 @@ TEST_P(DockedWindowResizerTest, DragToShelf) { // A window should be docked at the right edge. EXPECT_EQ(w1->GetRootWindow()->GetBoundsInScreen().right(), w1->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); DockedWindowLayoutManager* manager = static_cast<DockedWindowLayoutManager*>(w1->parent()->layout_manager()); EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager)); @@ -1453,8 +1442,8 @@ TEST_P(DockedWindowResizerTest, DragWindowWithTransientChild) { DragToVerticalPositionAndToEdge(DOCKED_EDGE_RIGHT, window.get(), 20); // A window should be docked at the right edge. - EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, child->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, child->parent()->id()); // Drag the child - it should move freely and stay where it is dragged. ASSERT_NO_FATAL_FAILURE(DragStart(child.get())); @@ -1469,8 +1458,8 @@ TEST_P(DockedWindowResizerTest, DragWindowWithTransientChild) { DragEnd(); // The window should be undocked and the transient child should be reparented. - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, window->parent()->id()); - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, child->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, child->parent()->id()); // The child should not have moved. EXPECT_EQ(gfx::Point(20 + 500, 20 + 20).ToString(), child->GetBoundsInScreen().origin().ToString()); @@ -1497,8 +1486,7 @@ TEST_P(DockedWindowResizerTest, DragWindowWithModalTransientChild) { scoped_ptr<aura::Window> child(CreateModalWindow(gfx::Rect(20, 20, 150, 20))); ::wm::AddTransientChild(window.get(), child.get()); EXPECT_EQ(window.get(), ::wm::GetTransientParent(child.get())); - EXPECT_EQ(internal::kShellWindowId_SystemModalContainer, - child->parent()->id()); + EXPECT_EQ(kShellWindowId_SystemModalContainer, child->parent()->id()); // End the drag, the |window| should have moved (if it is a panel it will // no longer be attached to the shelf since we dragged it above). @@ -1508,10 +1496,9 @@ TEST_P(DockedWindowResizerTest, DragWindowWithModalTransientChild) { // The original |window| should be in the default container (not docked or // attached). - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, window->parent()->id()); // The transient |child| should still be in system modal container. - EXPECT_EQ(internal::kShellWindowId_SystemModalContainer, - child->parent()->id()); + EXPECT_EQ(kShellWindowId_SystemModalContainer, child->parent()->id()); // The |child| should not have moved. EXPECT_EQ(gfx::Point(20, 20).ToString(), child->GetBoundsInScreen().origin().ToString()); @@ -1530,7 +1517,7 @@ TEST_P(DockedWindowResizerTest, SideSnapDocked) { // A window should be docked at the right edge. EXPECT_EQ(w1->GetRootWindow()->GetBoundsInScreen().right(), w1->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); DockedWindowLayoutManager* manager = static_cast<DockedWindowLayoutManager*>(w1->parent()->layout_manager()); EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager)); @@ -1546,7 +1533,7 @@ TEST_P(DockedWindowResizerTest, SideSnapDocked) { EXPECT_EQ(0, docked_width(manager)); EXPECT_EQ(work_area.height(), w1->bounds().height()); EXPECT_EQ(work_area.right(), w1->bounds().right()); - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, w1->parent()->id()); EXPECT_FALSE(window_state->IsDocked()); EXPECT_TRUE(window_state->IsSnapped()); @@ -1555,7 +1542,7 @@ TEST_P(DockedWindowResizerTest, SideSnapDocked) { // A window should be docked at the right edge. EXPECT_EQ(w1->GetRootWindow()->GetBoundsInScreen().right(), w1->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id()); EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager)); EXPECT_EQ(w1->bounds().width(), docked_width(manager)); EXPECT_TRUE(window_state->IsDocked()); @@ -1570,7 +1557,7 @@ TEST_P(DockedWindowResizerTest, SideSnapDocked) { EXPECT_EQ(0, docked_width(manager)); EXPECT_EQ(work_area.height(), w1->bounds().height()); EXPECT_EQ(work_area.x(), w1->bounds().x()); - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, w1->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, w1->parent()->id()); EXPECT_FALSE(window_state->IsDocked()); EXPECT_TRUE(window_state->IsSnapped()); } @@ -1589,7 +1576,7 @@ TEST_P(DockedWindowResizerTest, MaximizedDuringDrag) { DragToVerticalPositionAndToEdge(DOCKED_EDGE_RIGHT, window.get(), 20); EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().right(), window->GetBoundsInScreen().right()); - EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id()); DockedWindowLayoutManager* manager = static_cast<DockedWindowLayoutManager*>( window->parent()->layout_manager()); @@ -1609,7 +1596,7 @@ TEST_P(DockedWindowResizerTest, MaximizedDuringDrag) { generator.ReleaseLeftButton(); // |window| should get undocked. - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, window->parent()->id()); EXPECT_EQ(0, docked_width(manager)); EXPECT_EQ( ScreenUtil::GetMaximizedWindowBoundsInParent(window.get()).ToString(), @@ -1622,5 +1609,5 @@ INSTANTIATE_TEST_CASE_P(NormalOrPanel, DockedWindowResizerTest, testing::Values(ui::wm::WINDOW_TYPE_NORMAL, ui::wm::WINDOW_TYPE_PANEL)); -} // namespace internal + } // namespace ash diff --git a/ash/wm/drag_window_controller.cc b/ash/wm/drag_window_controller.cc index 516d59f..eee66e4 100644 --- a/ash/wm/drag_window_controller.cc +++ b/ash/wm/drag_window_controller.cc @@ -18,7 +18,6 @@ #include "ui/wm/core/window_util.h" namespace ash { -namespace internal { DragWindowController::DragWindowController(aura::Window* window) : window_(window), @@ -119,5 +118,4 @@ void DragWindowController::RecreateWindowLayers() { layer_owner_->root()->parent()->Remove(layer_owner_->root()); } -} // namespace internal } // namespace ash diff --git a/ash/wm/drag_window_controller.h b/ash/wm/drag_window_controller.h index 50020a1d..c5d8b4b 100644 --- a/ash/wm/drag_window_controller.h +++ b/ash/wm/drag_window_controller.h @@ -26,7 +26,6 @@ class Widget; } namespace ash { -namespace internal { // DragWindowController is responsible for showing a semi-transparent window // while dragging a window across displays. @@ -91,7 +90,6 @@ class ASH_EXPORT DragWindowController { DISALLOW_COPY_AND_ASSIGN(DragWindowController); }; -} // namespace internal } // namespace ash #endif // ASH_WM_DRAG_WINDOW_CONTROLLER_H_ diff --git a/ash/wm/drag_window_resizer.cc b/ash/wm/drag_window_resizer.cc index 2b91f85..15b0584 100644 --- a/ash/wm/drag_window_resizer.cc +++ b/ash/wm/drag_window_resizer.cc @@ -23,8 +23,6 @@ #include "ui/wm/core/window_util.h" namespace ash { -namespace internal { - namespace { // The maximum opacity of the drag phantom window. @@ -211,5 +209,4 @@ bool DragWindowResizer::ShouldAllowMouseWarp() { GetTarget()->type() == ui::wm::WINDOW_TYPE_PANEL); } -} // namespace internal } // namespace ash diff --git a/ash/wm/drag_window_resizer.h b/ash/wm/drag_window_resizer.h index 67f4702..a837b81 100644 --- a/ash/wm/drag_window_resizer.h +++ b/ash/wm/drag_window_resizer.h @@ -12,7 +12,6 @@ #include "ui/gfx/point.h" namespace ash { -namespace internal { class DragWindowController; @@ -64,7 +63,6 @@ class ASH_EXPORT DragWindowResizer : public WindowResizer { DISALLOW_COPY_AND_ASSIGN(DragWindowResizer); }; -} // namespace internal } // namespace ash #endif // ASH_WM_DRAG_WINDOW_RESIZER_H_ diff --git a/ash/wm/drag_window_resizer_unittest.cc b/ash/wm/drag_window_resizer_unittest.cc index 3ea9c3c..dbb4da0 100644 --- a/ash/wm/drag_window_resizer_unittest.cc +++ b/ash/wm/drag_window_resizer_unittest.cc @@ -27,7 +27,6 @@ #include "ui/wm/core/window_util.h" namespace ash { -namespace internal { namespace { const int kRootHeight = 600; @@ -107,7 +106,7 @@ class DragWindowResizerTest : public test::AshTestBase { return location; } - internal::ShelfLayoutManager* shelf_layout_manager() { + ShelfLayoutManager* shelf_layout_manager() { return Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager(); } @@ -356,7 +355,7 @@ TEST_F(DragWindowResizerTest, DragWindowController) { scoped_ptr<WindowResizer> resizer(CreateDragWindowResizer( window_.get(), gfx::Point(), HTCAPTION)); ASSERT_TRUE(resizer.get()); - internal::DragWindowResizer* drag_resizer = DragWindowResizer::instance_; + DragWindowResizer* drag_resizer = DragWindowResizer::instance_; ASSERT_TRUE(drag_resizer); EXPECT_FALSE(drag_resizer->drag_window_controller_.get()); @@ -408,7 +407,7 @@ TEST_F(DragWindowResizerTest, DragWindowController) { scoped_ptr<WindowResizer> resizer(CreateDragWindowResizer( window_.get(), gfx::Point(), HTCAPTION)); ASSERT_TRUE(resizer.get()); - internal::DragWindowResizer* drag_resizer = DragWindowResizer::instance_; + DragWindowResizer* drag_resizer = DragWindowResizer::instance_; ASSERT_TRUE(drag_resizer); EXPECT_FALSE(drag_resizer->drag_window_controller_.get()); @@ -509,8 +508,8 @@ TEST_F(DragWindowResizerTest, CursorDeviceScaleFactor) { { // Make sure the window is on the default container first. aura::Window* default_container = - GetRootWindowController(root_windows[1])->GetContainer( - internal::kShellWindowId_DefaultContainer); + GetRootWindowController(root_windows[1]) + ->GetContainer(kShellWindowId_DefaultContainer); default_container->AddChild(window_.get()); window_->SetBoundsInScreen( gfx::Rect(600, 0, 50, 60), @@ -633,5 +632,4 @@ TEST_F(DragWindowResizerTest, MoveWindowAcrossDisplays) { } } -} // namespace internal } // namespace ash diff --git a/ash/wm/event_client_impl.cc b/ash/wm/event_client_impl.cc index fbf5f86..b54e622 100644 --- a/ash/wm/event_client_impl.cc +++ b/ash/wm/event_client_impl.cc @@ -11,7 +11,6 @@ #include "ui/keyboard/keyboard_util.h" namespace ash { -namespace internal { EventClientImpl::EventClientImpl() { } @@ -56,5 +55,4 @@ ui::EventTarget* EventClientImpl::GetToplevelEventTarget() { return Shell::GetInstance(); } -} // namespace internal } // namespace ash diff --git a/ash/wm/event_client_impl.h b/ash/wm/event_client_impl.h index b38228b..da243f9 100644 --- a/ash/wm/event_client_impl.h +++ b/ash/wm/event_client_impl.h @@ -11,7 +11,6 @@ #include "ui/aura/client/event_client.h" namespace ash { -namespace internal { class EventClientImpl : public aura::client::EventClient { public: @@ -27,7 +26,6 @@ class EventClientImpl : public aura::client::EventClient { DISALLOW_COPY_AND_ASSIGN(EventClientImpl); }; -} // namespace internal } // namespace ash #endif // ASH_WM_EVENT_CLIENT_IMPL_H_ diff --git a/ash/wm/gestures/long_press_affordance_handler.cc b/ash/wm/gestures/long_press_affordance_handler.cc index 54e819777..961b864 100644 --- a/ash/wm/gestures/long_press_affordance_handler.cc +++ b/ash/wm/gestures/long_press_affordance_handler.cc @@ -25,7 +25,6 @@ #include "ui/views/widget/widget.h" namespace ash { -namespace internal { namespace { const int kAffordanceOuterRadius = 60; @@ -365,5 +364,4 @@ void LongPressAffordanceHandler::OnWindowDestroying(aura::Window* window) { StopAffordance(); } -} // namespace internal } // namespace ash diff --git a/ash/wm/gestures/long_press_affordance_handler.h b/ash/wm/gestures/long_press_affordance_handler.h index fa0337a..3826588 100644 --- a/ash/wm/gestures/long_press_affordance_handler.h +++ b/ash/wm/gestures/long_press_affordance_handler.h @@ -20,8 +20,6 @@ namespace test { class SystemGestureEventFilterTest; } -namespace internal { - // LongPressAffordanceHandler displays an animated affordance that is shown // on a TAP_DOWN gesture. The animation sequence consists of two parts: // The first part is a grow animation that starts at semi-long-press and @@ -69,7 +67,6 @@ class LongPressAffordanceHandler : public gfx::LinearAnimation, DISALLOW_COPY_AND_ASSIGN(LongPressAffordanceHandler); }; -} // namespace internal } // namespace ash #endif // ASH_WM_GESTURES_LONG_PRESS_AFFORDANCE_HANDLER_H_ diff --git a/ash/wm/gestures/overview_gesture_handler.cc b/ash/wm/gestures/overview_gesture_handler.cc index ebff8e6..381941d 100644 --- a/ash/wm/gestures/overview_gesture_handler.cc +++ b/ash/wm/gestures/overview_gesture_handler.cc @@ -15,8 +15,6 @@ #include "ui/gfx/screen.h" namespace ash { -namespace internal { - namespace { // The number of pixels from the top of the screen (a virtual bezel) to allow @@ -106,5 +104,4 @@ bool OverviewGestureHandler::ProcessGestureEvent( return true; } -} // namespace internal } // namespace ash diff --git a/ash/wm/gestures/overview_gesture_handler.h b/ash/wm/gestures/overview_gesture_handler.h index 8b9fde5..76f5fb8 100644 --- a/ash/wm/gestures/overview_gesture_handler.h +++ b/ash/wm/gestures/overview_gesture_handler.h @@ -17,7 +17,6 @@ class ScrollEvent; } namespace ash { -namespace internal { // This handles a 3-finger swipe down gesture from the top of the screen to // enter overview mode. @@ -45,7 +44,6 @@ class OverviewGestureHandler { DISALLOW_COPY_AND_ASSIGN(OverviewGestureHandler); }; -} // namespace internal } // namespace ash #endif // ASH_WM_GESTURES_OVERVIEW_GESTURE_HANDLER_H_ diff --git a/ash/wm/gestures/overview_gesture_handler_unittest.cc b/ash/wm/gestures/overview_gesture_handler_unittest.cc index 8406586..01eb012 100644 --- a/ash/wm/gestures/overview_gesture_handler_unittest.cc +++ b/ash/wm/gestures/overview_gesture_handler_unittest.cc @@ -13,7 +13,6 @@ #include "ui/aura/window_event_dispatcher.h" namespace ash { -namespace internal { class OverviewGestureHandlerTest : public test::AshTestBase { public: @@ -170,5 +169,4 @@ TEST_F(OverviewGestureHandlerTest, GestureSwipeTopOfWindow) { EXPECT_FALSE(IsSelecting()); } -} // namespace internal } // namespace ash diff --git a/ash/wm/gestures/shelf_gesture_handler.cc b/ash/wm/gestures/shelf_gesture_handler.cc index 5e89737..42b12c5 100644 --- a/ash/wm/gestures/shelf_gesture_handler.cc +++ b/ash/wm/gestures/shelf_gesture_handler.cc @@ -21,7 +21,6 @@ #include "ui/views/widget/widget.h" namespace ash { -namespace internal { ShelfGestureHandler::ShelfGestureHandler() : drag_in_progress_(false) { @@ -93,5 +92,4 @@ bool ShelfGestureHandler::ProcessGestureEvent(const ui::GestureEvent& event) { return false; } -} // namespace internal } // namespace ash diff --git a/ash/wm/gestures/shelf_gesture_handler.h b/ash/wm/gestures/shelf_gesture_handler.h index 90dfd7c..974bf2b 100644 --- a/ash/wm/gestures/shelf_gesture_handler.h +++ b/ash/wm/gestures/shelf_gesture_handler.h @@ -13,8 +13,6 @@ class GestureEvent; } namespace ash { -namespace internal { - class TrayGestureHandler; // This manages gestures on the shelf (e.g. launcher, status tray) that affects @@ -37,7 +35,6 @@ class ShelfGestureHandler { DISALLOW_COPY_AND_ASSIGN(ShelfGestureHandler); }; -} // namespace internal } // namespace ash #endif // ASH_WM_GESTURES_SHELF_GESTURE_HANDLER_H_ diff --git a/ash/wm/gestures/tray_gesture_handler.cc b/ash/wm/gestures/tray_gesture_handler.cc index 0d2e8cf..ac72929 100644 --- a/ash/wm/gestures/tray_gesture_handler.cc +++ b/ash/wm/gestures/tray_gesture_handler.cc @@ -16,7 +16,6 @@ const int kMinBubbleHeight = 13; namespace ash { -namespace internal { TrayGestureHandler::TrayGestureHandler() : widget_(NULL), @@ -105,5 +104,4 @@ void TrayGestureHandler::OnWidgetDestroying(views::Widget* widget) { widget_ = NULL; } -} // namespace internal } // namespace ash diff --git a/ash/wm/gestures/tray_gesture_handler.h b/ash/wm/gestures/tray_gesture_handler.h index 34f033b..424fc57 100644 --- a/ash/wm/gestures/tray_gesture_handler.h +++ b/ash/wm/gestures/tray_gesture_handler.h @@ -14,7 +14,6 @@ class GestureEvent; } namespace ash { -namespace internal { // Handles gesture events on the shelf to show the system tray bubble. class TrayGestureHandler : public views::WidgetObserver { @@ -42,7 +41,6 @@ class TrayGestureHandler : public views::WidgetObserver { DISALLOW_COPY_AND_ASSIGN(TrayGestureHandler); }; -} // namespace internal } // namespace ash #endif // ASH_WM_GESTURES_TRAY_GESTURE_HANDLER_H_ diff --git a/ash/wm/immersive_fullscreen_controller_unittest.cc b/ash/wm/immersive_fullscreen_controller_unittest.cc index 4693ef5..214ee92 100644 --- a/ash/wm/immersive_fullscreen_controller_unittest.cc +++ b/ash/wm/immersive_fullscreen_controller_unittest.cc @@ -1018,7 +1018,7 @@ TEST_F(ImmersiveFullscreenControllerTest, Bubbles) { // immersive fullscreen and that the shelf's state before entering immersive // fullscreen is restored upon exiting immersive fullscreen. TEST_F(ImmersiveFullscreenControllerTest, Shelf) { - ash::internal::ShelfLayoutManager* shelf = + ash::ShelfLayoutManager* shelf = ash::Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager(); // Shelf is visible by default. diff --git a/ash/wm/lock_state_controller.cc b/ash/wm/lock_state_controller.cc index 31031c1..09a46af 100644 --- a/ash/wm/lock_state_controller.cc +++ b/ash/wm/lock_state_controller.cc @@ -43,7 +43,7 @@ const int kMaxShutdownSoundDurationMs = 1500; aura::Window* GetBackground() { aura::Window* root_window = Shell::GetPrimaryRootWindow(); return Shell::GetContainer(root_window, - internal::kShellWindowId_DesktopBackgroundContainer); + kShellWindowId_DesktopBackgroundContainer); } bool IsBackgroundHidden() { @@ -163,7 +163,7 @@ LockStateController::TestApi::~TestApi() { } LockStateController::LockStateController() - : animator_(new internal::SessionStateAnimator()), + : animator_(new SessionStateAnimator()), login_status_(user::LOGGED_IN_NONE), system_is_locked_(false), shutting_down_(false), @@ -253,8 +253,8 @@ void LockStateController::CancelShutdownAnimation() { } animator_->StartGlobalAnimation( - internal::SessionStateAnimator::ANIMATION_UNDO_GRAYSCALE_BRIGHTNESS, - internal::SessionStateAnimator::ANIMATION_SPEED_REVERT_SHUTDOWN); + SessionStateAnimator::ANIMATION_UNDO_GRAYSCALE_BRIGHTNESS, + SessionStateAnimator::ANIMATION_SPEED_REVERT_SHUTDOWN); pre_shutdown_timer_.Stop(); } @@ -277,8 +277,8 @@ void LockStateController::RequestShutdown() { shell->cursor_manager()->LockCursor(); animator_->StartGlobalAnimation( - internal::SessionStateAnimator::ANIMATION_GRAYSCALE_BRIGHTNESS, - internal::SessionStateAnimator::ANIMATION_SPEED_SHUTDOWN); + SessionStateAnimator::ANIMATION_GRAYSCALE_BRIGHTNESS, + SessionStateAnimator::ANIMATION_SPEED_SHUTDOWN); StartRealShutdownTimer(true); } @@ -313,10 +313,9 @@ void LockStateController::OnAppTerminating() { Shell* shell = ash::Shell::GetInstance(); shell->cursor_manager()->HideCursor(); shell->cursor_manager()->LockCursor(); - animator_->StartAnimation( - internal::SessionStateAnimator::kAllContainersMask, - internal::SessionStateAnimator::ANIMATION_HIDE_IMMEDIATELY, - internal::SessionStateAnimator::ANIMATION_SPEED_IMMEDIATE); + animator_->StartAnimation(SessionStateAnimator::kAllContainersMask, + SessionStateAnimator::ANIMATION_HIDE_IMMEDIATELY, + SessionStateAnimator::ANIMATION_SPEED_IMMEDIATE); } } @@ -359,8 +358,7 @@ void LockStateController::StartPreShutdownAnimationTimer() { pre_shutdown_timer_.Stop(); pre_shutdown_timer_.Start( FROM_HERE, - animator_-> - GetDuration(internal::SessionStateAnimator::ANIMATION_SPEED_SHUTDOWN), + animator_->GetDuration(SessionStateAnimator::ANIMATION_SPEED_SHUTDOWN), this, &LockStateController::OnPreShutdownAnimationTimeout); } @@ -379,8 +377,8 @@ void LockStateController::StartRealShutdownTimer(bool with_animation_time) { base::TimeDelta duration = base::TimeDelta::FromMilliseconds(kShutdownRequestDelayMs); if (with_animation_time) { - duration += animator_->GetDuration( - internal::SessionStateAnimator::ANIMATION_SPEED_SHUTDOWN); + duration += + animator_->GetDuration(SessionStateAnimator::ANIMATION_SPEED_SHUTDOWN); } #if defined(OS_CHROMEOS) @@ -420,8 +418,8 @@ void LockStateController::StartCancellableShutdownAnimation() { shell->cursor_manager()->HideCursor(); animator_->StartGlobalAnimation( - internal::SessionStateAnimator::ANIMATION_GRAYSCALE_BRIGHTNESS, - internal::SessionStateAnimator::ANIMATION_SPEED_SHUTDOWN); + SessionStateAnimator::ANIMATION_GRAYSCALE_BRIGHTNESS, + SessionStateAnimator::ANIMATION_SPEED_SHUTDOWN); StartPreShutdownAnimationTimer(); } @@ -441,23 +439,21 @@ void LockStateController::StartImmediatePreLockAnimation( observer->Pause(); animator_->StartAnimationWithObserver( - internal::SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS, - internal::SessionStateAnimator::ANIMATION_LIFT, - internal::SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS, + SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS, + SessionStateAnimator::ANIMATION_LIFT, + SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS, observer); animator_->StartAnimationWithObserver( - internal::SessionStateAnimator::LAUNCHER, - internal::SessionStateAnimator::ANIMATION_FADE_OUT, - internal::SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS, + SessionStateAnimator::LAUNCHER, + SessionStateAnimator::ANIMATION_FADE_OUT, + SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS, observer); // Hide the screen locker containers so we can raise them later. - animator_->StartAnimation( - internal::SessionStateAnimator::LOCK_SCREEN_CONTAINERS, - internal::SessionStateAnimator::ANIMATION_HIDE_IMMEDIATELY, - internal::SessionStateAnimator::ANIMATION_SPEED_IMMEDIATE); + animator_->StartAnimation(SessionStateAnimator::LOCK_SCREEN_CONTAINERS, + SessionStateAnimator::ANIMATION_HIDE_IMMEDIATELY, + SessionStateAnimator::ANIMATION_SPEED_IMMEDIATE); AnimateBackgroundAppearanceIfNecessary( - internal::SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS, - observer); + SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS, observer); observer->Unpause(); @@ -480,23 +476,21 @@ void LockStateController::StartCancellablePreLockAnimation() { observer->Pause(); animator_->StartAnimationWithObserver( - internal::SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS, - internal::SessionStateAnimator::ANIMATION_LIFT, - internal::SessionStateAnimator::ANIMATION_SPEED_UNDOABLE, + SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS, + SessionStateAnimator::ANIMATION_LIFT, + SessionStateAnimator::ANIMATION_SPEED_UNDOABLE, observer); animator_->StartAnimationWithObserver( - internal::SessionStateAnimator::LAUNCHER, - internal::SessionStateAnimator::ANIMATION_FADE_OUT, - internal::SessionStateAnimator::ANIMATION_SPEED_UNDOABLE, + SessionStateAnimator::LAUNCHER, + SessionStateAnimator::ANIMATION_FADE_OUT, + SessionStateAnimator::ANIMATION_SPEED_UNDOABLE, observer); // Hide the screen locker containers so we can raise them later. - animator_->StartAnimation( - internal::SessionStateAnimator::LOCK_SCREEN_CONTAINERS, - internal::SessionStateAnimator::ANIMATION_HIDE_IMMEDIATELY, - internal::SessionStateAnimator::ANIMATION_SPEED_IMMEDIATE); + animator_->StartAnimation(SessionStateAnimator::LOCK_SCREEN_CONTAINERS, + SessionStateAnimator::ANIMATION_HIDE_IMMEDIATELY, + SessionStateAnimator::ANIMATION_SPEED_IMMEDIATE); AnimateBackgroundAppearanceIfNecessary( - internal::SessionStateAnimator::ANIMATION_SPEED_UNDOABLE, - observer); + SessionStateAnimator::ANIMATION_SPEED_UNDOABLE, observer); DispatchCancelMode(); FOR_EACH_OBSERVER(LockStateObserver, observers_, @@ -515,18 +509,17 @@ void LockStateController::CancelPreLockAnimation() { observer->Pause(); animator_->StartAnimationWithObserver( - internal::SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS, - internal::SessionStateAnimator::ANIMATION_UNDO_LIFT, - internal::SessionStateAnimator::ANIMATION_SPEED_UNDO_MOVE_WINDOWS, + SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS, + SessionStateAnimator::ANIMATION_UNDO_LIFT, + SessionStateAnimator::ANIMATION_SPEED_UNDO_MOVE_WINDOWS, observer); animator_->StartAnimationWithObserver( - internal::SessionStateAnimator::LAUNCHER, - internal::SessionStateAnimator::ANIMATION_FADE_IN, - internal::SessionStateAnimator::ANIMATION_SPEED_UNDO_MOVE_WINDOWS, + SessionStateAnimator::LAUNCHER, + SessionStateAnimator::ANIMATION_FADE_IN, + SessionStateAnimator::ANIMATION_SPEED_UNDO_MOVE_WINDOWS, observer); AnimateBackgroundHidingIfNecessary( - internal::SessionStateAnimator::ANIMATION_SPEED_UNDO_MOVE_WINDOWS, - observer); + SessionStateAnimator::ANIMATION_SPEED_UNDO_MOVE_WINDOWS, observer); observer->Unpause(); } @@ -542,9 +535,9 @@ void LockStateController::StartPostLockAnimation() { observer->Pause(); animator_->StartAnimationWithObserver( - internal::SessionStateAnimator::LOCK_SCREEN_CONTAINERS, - internal::SessionStateAnimator::ANIMATION_RAISE_TO_SCREEN, - internal::SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS, + SessionStateAnimator::LOCK_SCREEN_CONTAINERS, + SessionStateAnimator::ANIMATION_RAISE_TO_SCREEN, + SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS, observer); observer->Unpause(); } @@ -553,9 +546,9 @@ void LockStateController::StartUnlockAnimationBeforeUIDestroyed( base::Closure& callback) { VLOG(1) << "StartUnlockAnimationBeforeUIDestroyed"; animator_->StartAnimationWithCallback( - internal::SessionStateAnimator::LOCK_SCREEN_CONTAINERS, - internal::SessionStateAnimator::ANIMATION_LIFT, - internal::SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS, + SessionStateAnimator::LOCK_SCREEN_CONTAINERS, + SessionStateAnimator::ANIMATION_LIFT, + SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS, callback); } @@ -571,18 +564,17 @@ void LockStateController::StartUnlockAnimationAfterUIDestroyed() { observer->Pause(); animator_->StartAnimationWithObserver( - internal::SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS, - internal::SessionStateAnimator::ANIMATION_DROP, - internal::SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS, + SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS, + SessionStateAnimator::ANIMATION_DROP, + SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS, observer); animator_->StartAnimationWithObserver( - internal::SessionStateAnimator::LAUNCHER, - internal::SessionStateAnimator::ANIMATION_FADE_IN, - internal::SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS, + SessionStateAnimator::LAUNCHER, + SessionStateAnimator::ANIMATION_FADE_IN, + SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS, observer); AnimateBackgroundHidingIfNecessary( - internal::SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS, - observer); + SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS, observer); observer->Unpause(); } @@ -649,10 +641,9 @@ void LockStateController::StoreUnlockedProperties() { } if (unlocked_properties_->background_is_hidden) { // Hide background so that it can be animated later. - animator_->StartAnimation( - internal::SessionStateAnimator::DESKTOP_BACKGROUND, - internal::SessionStateAnimator::ANIMATION_HIDE_IMMEDIATELY, - internal::SessionStateAnimator::ANIMATION_SPEED_IMMEDIATE); + animator_->StartAnimation(SessionStateAnimator::DESKTOP_BACKGROUND, + SessionStateAnimator::ANIMATION_HIDE_IMMEDIATELY, + SessionStateAnimator::ANIMATION_SPEED_IMMEDIATE); ShowBackground(); } } @@ -663,35 +654,34 @@ void LockStateController::RestoreUnlockedProperties() { if (unlocked_properties_->background_is_hidden) { HideBackground(); // Restore background visibility. - animator_->StartAnimation( - internal::SessionStateAnimator::DESKTOP_BACKGROUND, - internal::SessionStateAnimator::ANIMATION_FADE_IN, - internal::SessionStateAnimator::ANIMATION_SPEED_IMMEDIATE); + animator_->StartAnimation(SessionStateAnimator::DESKTOP_BACKGROUND, + SessionStateAnimator::ANIMATION_FADE_IN, + SessionStateAnimator::ANIMATION_SPEED_IMMEDIATE); } unlocked_properties_.reset(); } void LockStateController::AnimateBackgroundAppearanceIfNecessary( - internal::SessionStateAnimator::AnimationSpeed speed, + SessionStateAnimator::AnimationSpeed speed, ui::LayerAnimationObserver* observer) { if (unlocked_properties_.get() && unlocked_properties_->background_is_hidden) { animator_->StartAnimationWithObserver( - internal::SessionStateAnimator::DESKTOP_BACKGROUND, - internal::SessionStateAnimator::ANIMATION_FADE_IN, + SessionStateAnimator::DESKTOP_BACKGROUND, + SessionStateAnimator::ANIMATION_FADE_IN, speed, observer); } } void LockStateController::AnimateBackgroundHidingIfNecessary( - internal::SessionStateAnimator::AnimationSpeed speed, + SessionStateAnimator::AnimationSpeed speed, ui::LayerAnimationObserver* observer) { if (unlocked_properties_.get() && unlocked_properties_->background_is_hidden) { animator_->StartAnimationWithObserver( - internal::SessionStateAnimator::DESKTOP_BACKGROUND, - internal::SessionStateAnimator::ANIMATION_FADE_OUT, + SessionStateAnimator::DESKTOP_BACKGROUND, + SessionStateAnimator::ANIMATION_FADE_OUT, speed, observer); } diff --git a/ash/wm/lock_state_controller.h b/ash/wm/lock_state_controller.h index 7109e73..b6d134f 100644 --- a/ash/wm/lock_state_controller.h +++ b/ash/wm/lock_state_controller.h @@ -265,15 +265,15 @@ class ASH_EXPORT LockStateController : public aura::WindowTreeHostObserver, // Fades in background layer with |speed| if it was hidden in unlocked state. void AnimateBackgroundAppearanceIfNecessary( - ash::internal::SessionStateAnimator::AnimationSpeed speed, + ash::SessionStateAnimator::AnimationSpeed speed, ui::LayerAnimationObserver* observer); // Fades out background layer with |speed| if it was hidden in unlocked state. void AnimateBackgroundHidingIfNecessary( - ash::internal::SessionStateAnimator::AnimationSpeed speed, + ash::SessionStateAnimator::AnimationSpeed speed, ui::LayerAnimationObserver* observer); - scoped_ptr<internal::SessionStateAnimator> animator_; + scoped_ptr<SessionStateAnimator> animator_; scoped_ptr<LockStateControllerDelegate> delegate_; diff --git a/ash/wm/lock_state_controller_unittest.cc b/ash/wm/lock_state_controller_unittest.cc index b950fe1..8b683b3 100644 --- a/ash/wm/lock_state_controller_unittest.cc +++ b/ash/wm/lock_state_controller_unittest.cc @@ -36,11 +36,7 @@ #endif namespace ash { - -using internal::SessionStateAnimator; - namespace test { - namespace { bool cursor_visible() { @@ -58,16 +54,16 @@ aura::Window* GetContainer(int container ) { } bool IsBackgroundHidden() { - return !GetContainer(internal::kShellWindowId_DesktopBackgroundContainer)-> - IsVisible(); + return !GetContainer(kShellWindowId_DesktopBackgroundContainer)->IsVisible(); } void HideBackground() { ui::ScopedLayerAnimationSettings settings( - GetContainer(internal::kShellWindowId_DesktopBackgroundContainer)-> - layer()->GetAnimator()); + GetContainer(kShellWindowId_DesktopBackgroundContainer) + ->layer() + ->GetAnimator()); settings.SetTransitionDuration(base::TimeDelta()); - GetContainer(internal::kShellWindowId_DesktopBackgroundContainer)->Hide(); + GetContainer(kShellWindowId_DesktopBackgroundContainer)->Hide(); } } // namespace @@ -396,8 +392,8 @@ class LockStateControllerTest : public AshTestBase { window_->SetType(ui::wm::WINDOW_TYPE_NORMAL); window_->Init(aura::WINDOW_LAYER_TEXTURED); window_->SetName("WINDOW"); - aura::Window* container = Shell::GetContainer(Shell::GetPrimaryRootWindow(), - internal::kShellWindowId_LockScreenContainer); + aura::Window* container = Shell::GetContainer( + Shell::GetPrimaryRootWindow(), kShellWindowId_LockScreenContainer); ASSERT_TRUE(container); container->AddChild(window_.get()); window_->Show(); @@ -617,8 +613,7 @@ TEST_F(LockStateControllerTest, DISABLED_LockAndCancel) { AdvancePartially(SessionStateAnimator::ANIMATION_SPEED_UNDOABLE, 0.5f); gfx::Transform transform_before_button_released = - GetContainer(internal::kShellWindowId_DefaultContainer)-> - layer()->transform(); + GetContainer(kShellWindowId_DefaultContainer)->layer()->transform(); // Release the button before the lock timer fires. ReleasePowerButton(); @@ -626,8 +621,7 @@ TEST_F(LockStateControllerTest, DISABLED_LockAndCancel) { ExpectPreLockAnimationCancel(); gfx::Transform transform_after_button_released = - GetContainer(internal::kShellWindowId_DefaultContainer)-> - layer()->transform(); + GetContainer(kShellWindowId_DefaultContainer)->layer()->transform(); // Expect no flickering, animation should proceed from mid-state. EXPECT_EQ(transform_before_button_released, transform_after_button_released); diff --git a/ash/wm/maximize_mode/maximize_mode_window_manager.cc b/ash/wm/maximize_mode/maximize_mode_window_manager.cc index a97030e..eb133f7 100644 --- a/ash/wm/maximize_mode/maximize_mode_window_manager.cc +++ b/ash/wm/maximize_mode/maximize_mode_window_manager.cc @@ -16,7 +16,6 @@ #include "ui/gfx/screen.h" namespace ash { -namespace internal { MaximizeModeWindowManager::~MaximizeModeWindowManager() { Shell::GetInstance()->RemoveShellObserver(this); @@ -170,8 +169,8 @@ void MaximizeModeWindowManager::AddWindowCreationObservers() { aura::Window::Windows root_windows = Shell::GetAllRootWindows(); for (aura::Window::Windows::const_iterator iter = root_windows.begin(); iter != root_windows.end(); ++iter) { - aura::Window* container = Shell::GetContainer(*iter, - internal::kShellWindowId_DefaultContainer); + aura::Window* container = + Shell::GetContainer(*iter, kShellWindowId_DefaultContainer); DCHECK(observed_container_windows_.find(container) == observed_container_windows_.end()); container->AddObserver(this); @@ -212,13 +211,11 @@ void MaximizeModeWindowManager::EnableBackdropBehindTopWindowOnEachDisplay( iter != controllers.end(); ++iter) { RootWindowController* controller = *iter; aura::Window* container = Shell::GetContainer( - controller->root_window(), - internal::kShellWindowId_DefaultContainer); + controller->root_window(), kShellWindowId_DefaultContainer); controller->workspace_controller()->SetMaximizeBackdropDelegate( scoped_ptr<WorkspaceLayoutManagerDelegate>( enable ? new WorkspaceBackdropDelegate(container) : NULL)); } } -} // namespace internal } // namespace ash diff --git a/ash/wm/maximize_mode/maximize_mode_window_manager.h b/ash/wm/maximize_mode/maximize_mode_window_manager.h index 0c51cb3..fb1e693 100644 --- a/ash/wm/maximize_mode/maximize_mode_window_manager.h +++ b/ash/wm/maximize_mode/maximize_mode_window_manager.h @@ -17,10 +17,8 @@ #include "ui/gfx/display_observer.h" namespace ash { -class Shell; - -namespace internal{ class MaximizeModeWindowState; +class Shell; // A window manager which - when created - will force all windows into maximized // mode. Exception are panels and windows which cannot be maximized. @@ -114,7 +112,6 @@ class ASH_EXPORT MaximizeModeWindowManager : public aura::WindowObserver, DISALLOW_COPY_AND_ASSIGN(MaximizeModeWindowManager); }; -} // namespace internal } // namespace ash #endif // ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_MANAGER_H_ diff --git a/ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc b/ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc index 82b07d7..8e93bb1 100644 --- a/ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc +++ b/ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc @@ -45,7 +45,7 @@ class MaximizeModeWindowManagerTest : public test::AshTestBase { } // Create the Maximized mode window manager. - ash::internal::MaximizeModeWindowManager* CreateMaximizeModeWindowManager() { + ash::MaximizeModeWindowManager* CreateMaximizeModeWindowManager() { EXPECT_FALSE(maximize_mode_window_manager()); Shell::GetInstance()->EnableMaximizeModeWindowManager(true); return maximize_mode_window_manager(); @@ -58,7 +58,7 @@ class MaximizeModeWindowManagerTest : public test::AshTestBase { } // Get the maximze window manager. - ash::internal::MaximizeModeWindowManager* maximize_mode_window_manager() { + ash::MaximizeModeWindowManager* maximize_mode_window_manager() { test::ShellTestApi test_api(Shell::GetInstance()); return test_api.maximize_mode_window_manager(); } @@ -98,8 +98,7 @@ class MaximizeModeWindowManagerTest : public test::AshTestBase { // Test that creating the object and destroying it without any windows should // not cause any problems. TEST_F(MaximizeModeWindowManagerTest, SimpleStart) { - ash::internal::MaximizeModeWindowManager* manager = - CreateMaximizeModeWindowManager(); + ash::MaximizeModeWindowManager* manager = CreateMaximizeModeWindowManager(); ASSERT_TRUE(manager); EXPECT_EQ(0, manager->GetNumberOfManagedWindows()); DestroyMaximizeModeWindowManager(); @@ -132,8 +131,7 @@ TEST_F(MaximizeModeWindowManagerTest, PreCreateWindows) { // Create the manager and make sure that all qualifying windows were detected // and changed. - ash::internal::MaximizeModeWindowManager* manager = - CreateMaximizeModeWindowManager(); + ash::MaximizeModeWindowManager* manager = CreateMaximizeModeWindowManager(); ASSERT_TRUE(manager); EXPECT_EQ(3, manager->GetNumberOfManagedWindows()); EXPECT_TRUE(wm::GetWindowState(w1.get())->IsMaximized()); @@ -172,8 +170,7 @@ TEST_F(MaximizeModeWindowManagerTest, PreCreateWindows) { // Test that creating windows while a maximizer exists picks them properly up. TEST_F(MaximizeModeWindowManagerTest, CreateWindows) { - ash::internal::MaximizeModeWindowManager* manager = - CreateMaximizeModeWindowManager(); + ash::MaximizeModeWindowManager* manager = CreateMaximizeModeWindowManager(); ASSERT_TRUE(manager); EXPECT_EQ(0, manager->GetNumberOfManagedWindows()); @@ -230,7 +227,7 @@ TEST_F(MaximizeModeWindowManagerTest, CreateWindows) { // Test that windows which got created before the maximizer was created can be // destroyed while the maximizer is still running. TEST_F(MaximizeModeWindowManagerTest, PreCreateWindowsDeleteWhileActive) { - ash::internal::MaximizeModeWindowManager* manager = NULL; + ash::MaximizeModeWindowManager* manager = NULL; { // Bounds for windows we know can be controlled. gfx::Rect rect1(10, 10, 200, 50); @@ -258,8 +255,7 @@ TEST_F(MaximizeModeWindowManagerTest, PreCreateWindowsDeleteWhileActive) { // Test that windows which got created while the maximizer was running can get // destroyed before the maximizer gets destroyed. TEST_F(MaximizeModeWindowManagerTest, CreateWindowsAndDeleteWhileActive) { - ash::internal::MaximizeModeWindowManager* manager = - CreateMaximizeModeWindowManager(); + ash::MaximizeModeWindowManager* manager = CreateMaximizeModeWindowManager(); ASSERT_TRUE(manager); EXPECT_EQ(0, manager->GetNumberOfManagedWindows()); { @@ -293,8 +289,7 @@ TEST_F(MaximizeModeWindowManagerTest, MaximizedShouldRemainMaximized) { wm::GetWindowState(window.get())->Maximize(); // Create the manager and make sure that the window gets detected. - ash::internal::MaximizeModeWindowManager* manager = - CreateMaximizeModeWindowManager(); + ash::MaximizeModeWindowManager* manager = CreateMaximizeModeWindowManager(); ASSERT_TRUE(manager); EXPECT_EQ(1, manager->GetNumberOfManagedWindows()); EXPECT_TRUE(wm::GetWindowState(window.get())->IsMaximized()); @@ -322,8 +317,7 @@ TEST_F(MaximizeModeWindowManagerTest, MinimizedWindowBehavior) { wm::GetWindowState(initially_maximized_window.get())->Maximize(); // Create the manager and make sure that the window gets detected. - ash::internal::MaximizeModeWindowManager* manager = - CreateMaximizeModeWindowManager(); + ash::MaximizeModeWindowManager* manager = CreateMaximizeModeWindowManager(); ASSERT_TRUE(manager); EXPECT_EQ(3, manager->GetNumberOfManagedWindows()); EXPECT_TRUE(wm::GetWindowState( @@ -368,8 +362,7 @@ TEST_F(MaximizeModeWindowManagerTest, DesktopSizeChangeMovesUnmaximizable) { CreateNonMaximizableWindow(ui::wm::WINDOW_TYPE_NORMAL, rect2)); // Turning on the manager will reposition (but not resize) the window. - ash::internal::MaximizeModeWindowManager* manager = - CreateMaximizeModeWindowManager(); + ash::MaximizeModeWindowManager* manager = CreateMaximizeModeWindowManager(); ASSERT_TRUE(manager); EXPECT_EQ(2, manager->GetNumberOfManagedWindows()); gfx::Rect moved_bounds(window1->bounds()); @@ -398,8 +391,7 @@ TEST_F(MaximizeModeWindowManagerTest, SizeChangeReturnWindowToOriginalPos) { CreateNonMaximizableWindow(ui::wm::WINDOW_TYPE_NORMAL, rect)); // Turning on the manager will reposition (but not resize) the window. - ash::internal::MaximizeModeWindowManager* manager = - CreateMaximizeModeWindowManager(); + ash::MaximizeModeWindowManager* manager = CreateMaximizeModeWindowManager(); ASSERT_TRUE(manager); EXPECT_EQ(1, manager->GetNumberOfManagedWindows()); gfx::Rect moved_bounds(window->bounds()); @@ -444,8 +436,7 @@ TEST_F(MaximizeModeWindowManagerTest, ModeChangeKeepsMRUOrder) { } // Activating the window manager should keep the order. - ash::internal::MaximizeModeWindowManager* manager = - CreateMaximizeModeWindowManager(); + ash::MaximizeModeWindowManager* manager = CreateMaximizeModeWindowManager(); ASSERT_TRUE(manager); EXPECT_EQ(5, manager->GetNumberOfManagedWindows()); { diff --git a/ash/wm/maximize_mode/maximize_mode_window_state.cc b/ash/wm/maximize_mode/maximize_mode_window_state.cc index 9f7c3d0..bfb1322 100644 --- a/ash/wm/maximize_mode/maximize_mode_window_state.cc +++ b/ash/wm/maximize_mode/maximize_mode_window_state.cc @@ -23,7 +23,6 @@ #include "ui/gfx/rect.h" namespace ash { -namespace internal { namespace { // Returns the biggest possible size for a window which is about to be @@ -223,5 +222,4 @@ void MaximizeModeWindowState::MaximizeOrCenterWindow( } } -} // namespace internal } // namespace ash diff --git a/ash/wm/maximize_mode/maximize_mode_window_state.h b/ash/wm/maximize_mode/maximize_mode_window_state.h index 0129960..5868ea3 100644 --- a/ash/wm/maximize_mode/maximize_mode_window_state.h +++ b/ash/wm/maximize_mode/maximize_mode_window_state.h @@ -8,7 +8,6 @@ #include "ash/wm/window_state.h" namespace ash { -namespace internal { class MaximizeModeWindowManager; // The MaximizeModeWindowState implementation which reduces all possible window @@ -62,7 +61,6 @@ class MaximizeModeWindowState : public wm::WindowState::State { DISALLOW_COPY_AND_ASSIGN(MaximizeModeWindowState); }; -} // namespace internal } // namespace ash #endif // ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_STATE_H_ diff --git a/ash/wm/maximize_mode/workspace_backdrop_delegate.cc b/ash/wm/maximize_mode/workspace_backdrop_delegate.cc index 455f362..0b7fc01 100644 --- a/ash/wm/maximize_mode/workspace_backdrop_delegate.cc +++ b/ash/wm/maximize_mode/workspace_backdrop_delegate.cc @@ -16,9 +16,6 @@ #include "ui/wm/core/window_util.h" namespace ash { - -namespace internal { - namespace { // The opacity of the backdrop. @@ -149,5 +146,4 @@ void WorkspaceBackdropDelegate::Show() { background_->GetNativeView()->layer()->SetOpacity(kBackdropOpacity); } -} // namespace internal } // namespace ash diff --git a/ash/wm/maximize_mode/workspace_backdrop_delegate.h b/ash/wm/maximize_mode/workspace_backdrop_delegate.h index 02ba3a3..27768ac 100644 --- a/ash/wm/maximize_mode/workspace_backdrop_delegate.h +++ b/ash/wm/maximize_mode/workspace_backdrop_delegate.h @@ -22,8 +22,6 @@ class Widget; namespace ash { -namespace internal { - // A background which gets created for a container |window| and which gets // stacked behind the topmost window (within that container) covering the // entire container. @@ -73,8 +71,6 @@ class WorkspaceBackdropDelegate : public aura::WindowObserver, DISALLOW_COPY_AND_ASSIGN(WorkspaceBackdropDelegate); }; -} // namespace internal - } // namespace ash #endif // ASH_WM_MAXIMIZE_MODE_WORKSPACE_BACKDROP_DELEGATE_H_ diff --git a/ash/wm/mru_window_tracker.cc b/ash/wm/mru_window_tracker.cc index 419fed5..83a805a 100644 --- a/ash/wm/mru_window_tracker.cc +++ b/ash/wm/mru_window_tracker.cc @@ -35,8 +35,8 @@ void AddTrackedWindows(aura::Window* root, // Adds windows being dragged in the docked container to |windows| list. void AddDraggedWindows(aura::Window* root, MruWindowTracker::WindowList* windows) { - aura::Window* container = Shell::GetContainer( - root, internal::kShellWindowId_DockedContainer); + aura::Window* container = + Shell::GetContainer(root, kShellWindowId_DockedContainer); const MruWindowTracker::WindowList& children = container->children(); for (MruWindowTracker::WindowList::const_iterator iter = children.begin(); iter != children.end(); ++iter) { diff --git a/ash/wm/mru_window_tracker_unittest.cc b/ash/wm/mru_window_tracker_unittest.cc index 924060d..8c507e1 100644 --- a/ash/wm/mru_window_tracker_unittest.cc +++ b/ash/wm/mru_window_tracker_unittest.cc @@ -13,7 +13,6 @@ #include "ui/aura/window.h" namespace ash { -namespace internal { class MruWindowTrackerTest : public test::AshTestBase { public: @@ -80,5 +79,4 @@ TEST_F(MruWindowTrackerTest, MinimizedWindowsAreLru) { EXPECT_EQ(w5.get(), window_list[5]); } -} // namespace internal } // namespace ash diff --git a/ash/wm/overlay_event_filter.cc b/ash/wm/overlay_event_filter.cc index ed4f316..6221e5e 100644 --- a/ash/wm/overlay_event_filter.cc +++ b/ash/wm/overlay_event_filter.cc @@ -11,7 +11,6 @@ #include "ui/views/widget/widget.h" namespace ash { -namespace internal { OverlayEventFilter::OverlayEventFilter() : delegate_(NULL) { @@ -70,5 +69,5 @@ void OverlayEventFilter::Cancel() { if (delegate_) delegate_->Cancel(); } -} // namespace internal + } // namespace ash diff --git a/ash/wm/overlay_event_filter.h b/ash/wm/overlay_event_filter.h index 252097c..7787c45 100644 --- a/ash/wm/overlay_event_filter.h +++ b/ash/wm/overlay_event_filter.h @@ -12,7 +12,6 @@ #include "ui/events/event_handler.h" namespace ash { -namespace internal { // EventFilter for the "overlay window", which intercepts events before they are // processed by the usual path (e.g. the partial screenshot UI, the keyboard @@ -66,7 +65,6 @@ class ASH_EXPORT OverlayEventFilter : public ui::EventHandler, DISALLOW_COPY_AND_ASSIGN(OverlayEventFilter); }; -} // namespace internal } // namespace ash #endif // ASH_WM_OVERLAY_EVENT_FILTER_H_ diff --git a/ash/wm/overview/window_overview.cc b/ash/wm/overview/window_overview.cc index 34d4dc4..8c7af63 100644 --- a/ash/wm/overview/window_overview.cc +++ b/ash/wm/overview/window_overview.cc @@ -389,10 +389,10 @@ void WindowOverview::PositionWindowsOnRoot( return; gfx::Size window_size; - gfx::Rect total_bounds = ScreenUtil::ConvertRectToScreen(root_window, + gfx::Rect total_bounds = ScreenUtil::ConvertRectToScreen( + root_window, ScreenUtil::GetDisplayWorkAreaBoundsInParent( - Shell::GetContainer(root_window, - internal::kShellWindowId_DefaultContainer))); + Shell::GetContainer(root_window, kShellWindowId_DefaultContainer))); // Find the minimum number of windows per row that will fit all of the // windows on screen. @@ -433,10 +433,10 @@ void WindowOverview::InitializeSelectionWidget() { params.keep_on_top = false; params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; params.opacity = views::Widget::InitParams::OPAQUE_WINDOW; - params.parent = Shell::GetContainer( - single_root_window_ ? single_root_window_ : - windows_->front()->GetRootWindow(), - internal::kShellWindowId_DefaultContainer); + params.parent = Shell::GetContainer(single_root_window_ + ? single_root_window_ + : windows_->front()->GetRootWindow(), + kShellWindowId_DefaultContainer); params.accept_events = false; selection_widget_->set_focus_on_creation(false); selection_widget_->Init(params); diff --git a/ash/wm/overview/window_selector.h b/ash/wm/overview/window_selector.h index d34c901..2139a17 100644 --- a/ash/wm/overview/window_selector.h +++ b/ash/wm/overview/window_selector.h @@ -25,15 +25,11 @@ class EventHandler; } namespace ash { - -namespace internal { -class WindowSelectorTest; -} - class ScopedShowWindow; class WindowOverview; class WindowSelectorDelegate; class WindowSelectorItem; +class WindowSelectorTest; // The WindowSelector allows selecting a window by alt-tabbing (CYCLE mode) or // by clicking or tapping on it (OVERVIEW mode). A WindowOverview will be shown @@ -87,7 +83,7 @@ class ASH_EXPORT WindowSelector aura::Window* actual_active) OVERRIDE; private: - friend class internal::WindowSelectorTest; + friend class WindowSelectorTest; // Begins positioning windows such that all windows are visible on the screen. void StartOverview(); diff --git a/ash/wm/overview/window_selector_controller.h b/ash/wm/overview/window_selector_controller.h index 2bd9697..18104f8 100644 --- a/ash/wm/overview/window_selector_controller.h +++ b/ash/wm/overview/window_selector_controller.h @@ -21,12 +21,8 @@ class Window; } namespace ash { - -namespace internal { -class WindowSelectorTest; -} - class WindowSelector; +class WindowSelectorTest; // Manages a window selector which displays an overview of all windows and // allows selecting a window to activate it. @@ -58,7 +54,7 @@ class ASH_EXPORT WindowSelectorController virtual void OnSelectionCanceled() OVERRIDE; private: - friend class internal::WindowSelectorTest; + friend class WindowSelectorTest; // Dispatched when window selection begins. void OnSelectionStarted(); diff --git a/ash/wm/overview/window_selector_panels.cc b/ash/wm/overview/window_selector_panels.cc index 37d6687..bd165b2 100644 --- a/ash/wm/overview/window_selector_panels.cc +++ b/ash/wm/overview/window_selector_panels.cc @@ -62,10 +62,9 @@ void ScopedTransformPanelWindow::PrepareForOverview() { } views::Widget* ScopedTransformPanelWindow::GetCalloutWidget() { - DCHECK(window()->parent()->id() == internal::kShellWindowId_PanelContainer); - internal::PanelLayoutManager* panel_layout_manager = - static_cast<internal::PanelLayoutManager*>( - window()->parent()->layout_manager()); + DCHECK(window()->parent()->id() == kShellWindowId_PanelContainer); + PanelLayoutManager* panel_layout_manager = + static_cast<PanelLayoutManager*>(window()->parent()->layout_manager()); return panel_layout_manager->GetCalloutWidgetForPanel(window()); } diff --git a/ash/wm/overview/window_selector_unittest.cc b/ash/wm/overview/window_selector_unittest.cc index f78bcbf..20184aa 100644 --- a/ash/wm/overview/window_selector_unittest.cc +++ b/ash/wm/overview/window_selector_unittest.cc @@ -39,8 +39,6 @@ #include "ui/wm/public/activation_delegate.h" namespace ash { -namespace internal { - namespace { class NonActivatableActivationDelegate @@ -1038,7 +1036,7 @@ TEST_F(WindowSelectorTest, DISABLED_DragDropInProgress) { gfx::Rect bounds(0, 0, 400, 400); scoped_ptr<aura::Window> window(CreateWindow(bounds)); test::ShellTestApi shell_test_api(Shell::GetInstance()); - ash::internal::DragDropController* drag_drop_controller = + ash::DragDropController* drag_drop_controller = shell_test_api.drag_drop_controller(); ui::OSExchangeData data; base::MessageLoopForUI::current()->PostTask(FROM_HERE, @@ -1089,5 +1087,4 @@ TEST_F(WindowSelectorTest, HitTestingInOverview) { } } -} // namespace internal } // namespace ash diff --git a/ash/wm/overview/window_selector_window.cc b/ash/wm/overview/window_selector_window.cc index 40b53d4..942edf4 100644 --- a/ash/wm/overview/window_selector_window.cc +++ b/ash/wm/overview/window_selector_window.cc @@ -28,8 +28,8 @@ views::Widget* CreateCloseWindowButton(aura::Window* root_window, params.can_activate = false; params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; - params.parent = Shell::GetContainer(root_window, - ash::internal::kShellWindowId_OverlayContainer); + params.parent = + Shell::GetContainer(root_window, ash::kShellWindowId_OverlayContainer); widget->set_focus_on_creation(false); widget->Init(params); views::ImageButton* button = new views::ImageButton(listener); diff --git a/ash/wm/panels/panel_layout_manager.cc b/ash/wm/panels/panel_layout_manager.cc index 95db257..9266f94 100644 --- a/ash/wm/panels/panel_layout_manager.cc +++ b/ash/wm/panels/panel_layout_manager.cc @@ -37,9 +37,8 @@ #include "ui/wm/public/activation_client.h" namespace ash { -namespace internal { - namespace { + const int kPanelIdealSpacing = 4; const float kMaxHeightFactor = .80f; @@ -310,7 +309,7 @@ void PanelLayoutManager::SetShelf(Shelf* shelf) { shelf_ = shelf; shelf_->AddIconObserver(this); if (shelf_->shelf_widget()) { - shelf_layout_manager_ = ash::internal::ShelfLayoutManager::ForShelf( + shelf_layout_manager_ = ash::ShelfLayoutManager::ForShelf( shelf_->shelf_widget()->GetNativeWindow()); WillChangeVisibilityState(shelf_layout_manager_->visibility_state()); shelf_layout_manager_->AddObserver(this); @@ -885,5 +884,4 @@ void PanelLayoutManager::OnKeyboardBoundsChanging( OnWindowResized(); } -} // namespace internal } // namespace ash diff --git a/ash/wm/panels/panel_layout_manager.h b/ash/wm/panels/panel_layout_manager.h index 2d17b2d..f0c093d 100644 --- a/ash/wm/panels/panel_layout_manager.h +++ b/ash/wm/panels/panel_layout_manager.h @@ -36,10 +36,8 @@ class Widget; } namespace ash { -class Shelf; - -namespace internal { class PanelCalloutWidget; +class Shelf; class ShelfLayoutManager; // PanelLayoutManager is responsible for organizing panels within the @@ -186,7 +184,6 @@ class ASH_EXPORT PanelLayoutManager DISALLOW_COPY_AND_ASSIGN(PanelLayoutManager); }; -} // namespace internal } // namespace ash #endif // ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_ diff --git a/ash/wm/panels/panel_layout_manager_unittest.cc b/ash/wm/panels/panel_layout_manager_unittest.cc index faba4f7..853f648 100644 --- a/ash/wm/panels/panel_layout_manager_unittest.cc +++ b/ash/wm/panels/panel_layout_manager_unittest.cc @@ -38,7 +38,6 @@ #include "ui/views/widget/widget.h" namespace ash { -namespace internal { using aura::test::WindowIsAbove; @@ -75,7 +74,7 @@ class PanelLayoutManagerTest : public test::AshTestBase { aura::Window* GetPanelContainer(aura::Window* panel) { return Shell::GetContainer(panel->GetRootWindow(), - internal::kShellWindowId_PanelContainer); + kShellWindowId_PanelContainer); } views::Widget* GetCalloutWidgetForPanel(aura::Window* panel) { @@ -238,9 +237,9 @@ class PanelLayoutManagerTest : public test::AshTestBase { void SetShelfAutoHideBehavior(aura::Window* window, ShelfAutoHideBehavior behavior) { - internal::ShelfLayoutManager* shelf = - RootWindowController::ForWindow(window)->shelf()-> - shelf_layout_manager(); + ShelfLayoutManager* shelf = RootWindowController::ForWindow(window) + ->shelf() + ->shelf_layout_manager(); shelf->SetAutoHideBehavior(behavior); ShelfView* shelf_view = GetShelfView(Shelf::ForWindow(window)); test::ShelfViewTestAPI test_api(shelf_view); @@ -249,13 +248,13 @@ class PanelLayoutManagerTest : public test::AshTestBase { void SetShelfVisibilityState(aura::Window* window, ShelfVisibilityState visibility_state) { - internal::ShelfLayoutManager* shelf = - RootWindowController::ForWindow(window)->shelf()-> - shelf_layout_manager(); + ShelfLayoutManager* shelf = RootWindowController::ForWindow(window) + ->shelf() + ->shelf_layout_manager(); shelf->SetState(visibility_state); } - internal::ShelfView* GetShelfView(Shelf* shelf) { + ShelfView* GetShelfView(Shelf* shelf) { return test::ShelfTestAPI(shelf).shelf_view(); } @@ -609,10 +608,10 @@ TEST_F(PanelLayoutManagerTest, PanelMoveBetweenMultipleDisplays) { EXPECT_EQ(root_windows[1], p1_d2->GetRootWindow()); EXPECT_EQ(root_windows[1], p2_d2->GetRootWindow()); - EXPECT_EQ(internal::kShellWindowId_PanelContainer, p1_d1->parent()->id()); - EXPECT_EQ(internal::kShellWindowId_PanelContainer, p2_d1->parent()->id()); - EXPECT_EQ(internal::kShellWindowId_PanelContainer, p1_d2->parent()->id()); - EXPECT_EQ(internal::kShellWindowId_PanelContainer, p2_d2->parent()->id()); + EXPECT_EQ(kShellWindowId_PanelContainer, p1_d1->parent()->id()); + EXPECT_EQ(kShellWindowId_PanelContainer, p2_d1->parent()->id()); + EXPECT_EQ(kShellWindowId_PanelContainer, p1_d2->parent()->id()); + EXPECT_EQ(kShellWindowId_PanelContainer, p2_d2->parent()->id()); // Test a panel on 1st display. // Clicking on the same display has no effect. @@ -788,5 +787,4 @@ TEST_F(PanelLayoutManagerTest, PanelsHideAndRestoreWithShelf) { INSTANTIATE_TEST_CASE_P(LtrRtl, PanelLayoutManagerTextDirectionTest, testing::Bool()); -} // namespace internal } // namespace ash diff --git a/ash/wm/panels/panel_window_event_handler.cc b/ash/wm/panels/panel_window_event_handler.cc index a3d5d8b..006c5d8 100644 --- a/ash/wm/panels/panel_window_event_handler.cc +++ b/ash/wm/panels/panel_window_event_handler.cc @@ -13,7 +13,6 @@ #include "ui/events/event.h" namespace ash { -namespace internal { PanelWindowEventHandler::PanelWindowEventHandler() { } @@ -52,5 +51,4 @@ void PanelWindowEventHandler::OnGestureEvent(ui::GestureEvent* event) { } } -} // namespace internal } // namespace ash diff --git a/ash/wm/panels/panel_window_event_handler.h b/ash/wm/panels/panel_window_event_handler.h index c972ed1..35e63aa 100644 --- a/ash/wm/panels/panel_window_event_handler.h +++ b/ash/wm/panels/panel_window_event_handler.h @@ -8,7 +8,6 @@ #include "ui/events/event_handler.h" namespace ash { -namespace internal { // PanelWindowEventHandler minimizes panels when the user double clicks or // double taps on the panel header. @@ -25,7 +24,6 @@ class PanelWindowEventHandler : public ui::EventHandler { DISALLOW_COPY_AND_ASSIGN(PanelWindowEventHandler); }; -} // namespace internal } // namespace ash #endif // ASH_WM_PANELS_PANEL_WINDOW_EVENT_HANDLER_H_ diff --git a/ash/wm/panels/panel_window_resizer.cc b/ash/wm/panels/panel_window_resizer.cc index 29803e8..14632b6 100644 --- a/ash/wm/panels/panel_window_resizer.cc +++ b/ash/wm/panels/panel_window_resizer.cc @@ -32,11 +32,9 @@ namespace ash { namespace { const int kPanelSnapToLauncherDistance = 30; -internal::PanelLayoutManager* GetPanelLayoutManager( - aura::Window* panel_container) { - DCHECK(panel_container->id() == internal::kShellWindowId_PanelContainer); - return static_cast<internal::PanelLayoutManager*>( - panel_container->layout_manager()); +PanelLayoutManager* GetPanelLayoutManager(aura::Window* panel_container) { + DCHECK(panel_container->id() == kShellWindowId_PanelContainer); + return static_cast<PanelLayoutManager*>(panel_container->layout_manager()); } } // namespace @@ -74,8 +72,8 @@ void PanelWindowResizer::Drag(const gfx::Point& location, int event_flags) { GetPanelLayoutManager(panel_container_)->FinishDragging(); aura::Window* dst_root = Shell::GetInstance()->display_controller()-> GetRootWindowForDisplayId(dst_display.id()); - panel_container_ = Shell::GetContainer( - dst_root, internal::kShellWindowId_PanelContainer); + panel_container_ = + Shell::GetContainer(dst_root, kShellWindowId_PanelContainer); // The panel's parent already knows that the drag is in progress for this // panel. @@ -124,9 +122,8 @@ PanelWindowResizer::PanelWindowResizer(WindowResizer* next_window_resizer, was_attached_(window_state->panel_attached()), weak_ptr_factory_(this) { DCHECK(details().is_resizable); - panel_container_ = Shell::GetContainer( - GetTarget()->GetRootWindow(), - internal::kShellWindowId_PanelContainer); + panel_container_ = Shell::GetContainer(GetTarget()->GetRootWindow(), + kShellWindowId_PanelContainer); initial_panel_container_ = panel_container_; } @@ -134,7 +131,7 @@ bool PanelWindowResizer::AttachToLauncher(const gfx::Rect& bounds, gfx::Point* offset) { bool should_attach = false; if (panel_container_) { - internal::PanelLayoutManager* panel_layout_manager = + PanelLayoutManager* panel_layout_manager = GetPanelLayoutManager(panel_container_); gfx::Rect launcher_bounds = ScreenUtil::ConvertRectFromScreen( GetTarget()->parent(), diff --git a/ash/wm/panels/panel_window_resizer_unittest.cc b/ash/wm/panels/panel_window_resizer_unittest.cc index 4debaed..07bb7a5 100644 --- a/ash/wm/panels/panel_window_resizer_unittest.cc +++ b/ash/wm/panels/panel_window_resizer_unittest.cc @@ -31,7 +31,6 @@ #include "ui/wm/core/window_util.h" namespace ash { -namespace internal { class PanelWindowResizerTest : public test::AshTestBase { public: @@ -65,11 +64,9 @@ class PanelWindowResizerTest : public test::AshTestBase { aura::Window* window = CreateTestWindowInShellWithDelegateAndType( NULL, ui::wm::WINDOW_TYPE_PANEL, 0, bounds); shelf_delegate_->AddShelfItem(window); - PanelLayoutManager* manager = - static_cast<PanelLayoutManager*>( - Shell::GetContainer(window->GetRootWindow(), - internal::kShellWindowId_PanelContainer)-> - layout_manager()); + PanelLayoutManager* manager = static_cast<PanelLayoutManager*>( + Shell::GetContainer(window->GetRootWindow(), + kShellWindowId_PanelContainer)->layout_manager()); manager->Relayout(); return window; } @@ -103,7 +100,7 @@ class PanelWindowResizerTest : public test::AshTestBase { wm::WindowState* window_state = wm::GetWindowState(window); EXPECT_TRUE(window_state->panel_attached()); aura::Window* root_window = window->GetRootWindow(); - EXPECT_EQ(internal::kShellWindowId_PanelContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_PanelContainer, window->parent()->id()); DragStart(window); gfx::Rect initial_bounds = window->GetBoundsInScreen(); @@ -122,8 +119,7 @@ class PanelWindowResizerTest : public test::AshTestBase { DragEnd(); EXPECT_FALSE(window_state->panel_attached()); - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, - window->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, window->parent()->id()); EXPECT_EQ(root_window, window->GetRootWindow()); DragStart(window); @@ -136,7 +132,7 @@ class PanelWindowResizerTest : public test::AshTestBase { EXPECT_TRUE(window_state->panel_attached()); EXPECT_EQ(initial_bounds.x(), window->GetBoundsInScreen().x()); EXPECT_EQ(initial_bounds.y(), window->GetBoundsInScreen().y()); - EXPECT_EQ(internal::kShellWindowId_PanelContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_PanelContainer, window->parent()->id()); } void TestWindowOrder(const std::vector<aura::Window*>& window_order) { @@ -185,7 +181,7 @@ class PanelWindowResizerTest : public test::AshTestBase { private: scoped_ptr<WindowResizer> resizer_; - internal::PanelLayoutManager* panel_layout_manager_; + PanelLayoutManager* panel_layout_manager_; ShelfModel* model_; test::TestShelfDelegate* shelf_delegate_; @@ -310,7 +306,7 @@ TEST_F(PanelWindowResizerTest, DetachThenDragAcrossDisplays) { EXPECT_EQ(initial_bounds.x(), window->GetBoundsInScreen().x()); EXPECT_EQ(initial_bounds.y() - 100, window->GetBoundsInScreen().y()); EXPECT_FALSE(wm::GetWindowState(window.get())->panel_attached()); - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, window->parent()->id()); DragStart(window.get()); DragMove(500, 0); @@ -319,7 +315,7 @@ TEST_F(PanelWindowResizerTest, DetachThenDragAcrossDisplays) { EXPECT_EQ(initial_bounds.x() + 500, window->GetBoundsInScreen().x()); EXPECT_EQ(initial_bounds.y() - 100, window->GetBoundsInScreen().y()); EXPECT_FALSE(wm::GetWindowState(window.get())->panel_attached()); - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, window->parent()->id()); } TEST_F(PanelWindowResizerTest, DetachAcrossDisplays) { @@ -339,7 +335,7 @@ TEST_F(PanelWindowResizerTest, DetachAcrossDisplays) { EXPECT_EQ(initial_bounds.x() + 500, window->GetBoundsInScreen().x()); EXPECT_EQ(initial_bounds.y() - 100, window->GetBoundsInScreen().y()); EXPECT_FALSE(wm::GetWindowState(window.get())->panel_attached()); - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, window->parent()->id()); } TEST_F(PanelWindowResizerTest, DetachThenAttachToSecondDisplay) { @@ -372,7 +368,7 @@ TEST_F(PanelWindowResizerTest, DetachThenAttachToSecondDisplay) { // When dropped should move to second display's panel container. EXPECT_EQ(root_windows[1], window->GetRootWindow()); EXPECT_TRUE(wm::GetWindowState(window.get())->panel_attached()); - EXPECT_EQ(internal::kShellWindowId_PanelContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_PanelContainer, window->parent()->id()); } TEST_F(PanelWindowResizerTest, AttachToSecondDisplay) { @@ -398,7 +394,7 @@ TEST_F(PanelWindowResizerTest, AttachToSecondDisplay) { // When dropped should move to second display's panel container. EXPECT_EQ(root_windows[1], window->GetRootWindow()); EXPECT_TRUE(wm::GetWindowState(window.get())->panel_attached()); - EXPECT_EQ(internal::kShellWindowId_PanelContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_PanelContainer, window->parent()->id()); } TEST_F(PanelWindowResizerTest, AttachToSecondFullscreenDisplay) { @@ -431,7 +427,7 @@ TEST_F(PanelWindowResizerTest, AttachToSecondFullscreenDisplay) { // When dropped should move to second display's panel container. EXPECT_EQ(root_windows[1], window->GetRootWindow()); EXPECT_TRUE(wm::GetWindowState(window.get())->panel_attached()); - EXPECT_EQ(internal::kShellWindowId_PanelContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_PanelContainer, window->parent()->id()); EXPECT_TRUE(window->IsVisible()); EXPECT_TRUE(wm::GetWindowState(window.get())->IsActive()); EXPECT_EQ(initial_bounds.y() + 200, window->GetBoundsInScreen().y()); @@ -441,19 +437,19 @@ TEST_F(PanelWindowResizerTest, RevertDragRestoresAttachment) { scoped_ptr<aura::Window> window( CreatePanelWindow(gfx::Point(0, 0))); EXPECT_TRUE(wm::GetWindowState(window.get())->panel_attached()); - EXPECT_EQ(internal::kShellWindowId_PanelContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_PanelContainer, window->parent()->id()); DragStart(window.get()); DragMove(0, -100); DragRevert(); EXPECT_TRUE(wm::GetWindowState(window.get())->panel_attached()); - EXPECT_EQ(internal::kShellWindowId_PanelContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_PanelContainer, window->parent()->id()); // Detach panel. DragStart(window.get()); DragMove(0, -100); DragEnd(); EXPECT_FALSE(wm::GetWindowState(window.get())->panel_attached()); - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, window->parent()->id()); // Drag back to launcher. DragStart(window.get()); @@ -462,7 +458,7 @@ TEST_F(PanelWindowResizerTest, RevertDragRestoresAttachment) { // When the drag is reverted it should remain detached. DragRevert(); EXPECT_FALSE(wm::GetWindowState(window.get())->panel_attached()); - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, window->parent()->id()); } TEST_F(PanelWindowResizerTest, DragMovesToPanelLayer) { @@ -470,17 +466,16 @@ TEST_F(PanelWindowResizerTest, DragMovesToPanelLayer) { DragStart(window.get()); DragMove(0, -100); DragEnd(); - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, window->parent()->id()); // While moving the panel window should be moved to the panel container. DragStart(window.get()); DragMove(20, 0); - EXPECT_EQ(internal::kShellWindowId_PanelContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_PanelContainer, window->parent()->id()); DragEnd(); // When dropped it should return to the default container. - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, - window->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, window->parent()->id()); } TEST_P(PanelWindowResizerTextDirectionTest, DragReordersPanelsHorizontal) { @@ -520,7 +515,7 @@ TEST_P(PanelWindowResizerTransientTest, PanelWithTransientChild) { DragStart(child.get()); DragMove(50, dy); // While moving the transient child window should be in the panel container. - EXPECT_EQ(internal::kShellWindowId_PanelContainer, child->parent()->id()); + EXPECT_EQ(kShellWindowId_PanelContainer, child->parent()->id()); DragEnd(); // Child should move, |window| should not. EXPECT_EQ(gfx::Point(20 + 50, 20 + dy).ToString(), @@ -532,7 +527,7 @@ TEST_P(PanelWindowResizerTransientTest, PanelWithTransientChild) { DragStart(child.get()); DragMove(350, 0); // While moving the transient child window should be in the panel container. - EXPECT_EQ(internal::kShellWindowId_PanelContainer, child->parent()->id()); + EXPECT_EQ(kShellWindowId_PanelContainer, child->parent()->id()); DragEnd(); // |child| should move, |window| should not. EXPECT_EQ(gfx::Point(20 + 50 + 350, 20 + dy).ToString(), @@ -542,23 +537,23 @@ TEST_P(PanelWindowResizerTransientTest, PanelWithTransientChild) { DragStart(window.get()); DragMove(0, -100); // While moving the windows should be in the panel container. - EXPECT_EQ(internal::kShellWindowId_PanelContainer, window->parent()->id()); - EXPECT_EQ(internal::kShellWindowId_PanelContainer, child->parent()->id()); + EXPECT_EQ(kShellWindowId_PanelContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_PanelContainer, child->parent()->id()); DragEnd(); // When dropped they should return to the default container. - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, window->parent()->id()); - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, child->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, child->parent()->id()); // While moving the window and child should be moved to the panel container. DragStart(window.get()); DragMove(20, 0); - EXPECT_EQ(internal::kShellWindowId_PanelContainer, window->parent()->id()); - EXPECT_EQ(internal::kShellWindowId_PanelContainer, child->parent()->id()); + EXPECT_EQ(kShellWindowId_PanelContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_PanelContainer, child->parent()->id()); DragEnd(); // When dropped they should return to the default container. - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, window->parent()->id()); - EXPECT_EQ(internal::kShellWindowId_DefaultContainer, child->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, window->parent()->id()); + EXPECT_EQ(kShellWindowId_DefaultContainer, child->parent()->id()); } INSTANTIATE_TEST_CASE_P(LtrRtl, PanelWindowResizerTextDirectionTest, @@ -569,5 +564,4 @@ INSTANTIATE_TEST_CASE_P(NormalPanelPopup, ui::wm::WINDOW_TYPE_PANEL, ui::wm::WINDOW_TYPE_POPUP)); -} // namespace internal } // namespace ash diff --git a/ash/wm/partial_screenshot_view.cc b/ash/wm/partial_screenshot_view.cc index 30b12f1..cec063d 100644 --- a/ash/wm/partial_screenshot_view.cc +++ b/ash/wm/partial_screenshot_view.cc @@ -26,7 +26,7 @@ namespace ash { // A self-owned object to handle the cancel and the finish of current partial // screenshot session. class PartialScreenshotView::OverlayDelegate - : public internal::OverlayEventFilter::Delegate, + : public OverlayEventFilter::Delegate, public views::WidgetObserver { public: OverlayDelegate() { @@ -42,10 +42,10 @@ class PartialScreenshotView::OverlayDelegate virtual void Cancel() OVERRIDE { // Make sure the mouse_warp_mode allows warping. It can be stopped by a // partial screenshot view. - internal::MouseCursorEventFilter* mouse_cursor_filter = + MouseCursorEventFilter* mouse_cursor_filter = Shell::GetInstance()->mouse_cursor_filter(); mouse_cursor_filter->set_mouse_warp_mode( - internal::MouseCursorEventFilter::WARP_ALWAYS); + MouseCursorEventFilter::WARP_ALWAYS); for (size_t i = 0; i < widgets_.size(); ++i) widgets_[i]->Close(); } @@ -116,9 +116,8 @@ void PartialScreenshotView::Init(aura::Window* root_window) { params.delegate = this; // The partial screenshot rectangle has to be at the real top of // the screen. - params.parent = Shell::GetContainer( - root_window, - internal::kShellWindowId_OverlayContainer); + params.parent = + Shell::GetContainer(root_window, kShellWindowId_OverlayContainer); widget->Init(params); widget->SetContentsView(this); @@ -194,10 +193,9 @@ bool PartialScreenshotView::OnMousePressed(const ui::MouseEvent& event) { // Prevent moving across displays during drag. Capturing a screenshot across // the displays is not supported yet. // TODO(mukai): remove this restriction. - internal::MouseCursorEventFilter* mouse_cursor_filter = + MouseCursorEventFilter* mouse_cursor_filter = Shell::GetInstance()->mouse_cursor_filter(); - mouse_cursor_filter->set_mouse_warp_mode( - internal::MouseCursorEventFilter::WARP_NONE); + mouse_cursor_filter->set_mouse_warp_mode(MouseCursorEventFilter::WARP_NONE); OnSelectionStarted(event.location()); return true; } diff --git a/ash/wm/resize_shadow.cc b/ash/wm/resize_shadow.cc index 65f6623..408db4b 100644 --- a/ash/wm/resize_shadow.cc +++ b/ash/wm/resize_shadow.cc @@ -40,7 +40,6 @@ void ShowLayer(ui::Layer* layer, bool visible) { } // namespace namespace ash { -namespace internal { ResizeShadow::ResizeShadow() : last_hit_test_(HTNOWHERE) {} @@ -106,5 +105,4 @@ void ResizeShadow::Layout(const gfx::Rect& content_bounds) { image_grid_->SetContentBounds(local_bounds); } -} // namespace internal } // namespace ash diff --git a/ash/wm/resize_shadow.h b/ash/wm/resize_shadow.h index 8b05d92..6add50f 100644 --- a/ash/wm/resize_shadow.h +++ b/ash/wm/resize_shadow.h @@ -22,7 +22,6 @@ class ImageGrid; } namespace ash { -namespace internal { // A class to render the resize edge effect when the user moves their mouse // over a sizing edge. This is just a visual effect; the actual resize is @@ -60,7 +59,6 @@ class ResizeShadow { DISALLOW_COPY_AND_ASSIGN(ResizeShadow); }; -} // namespace internal } // namespace ash #endif // ASH_WM_RESIZE_SHADOW_H_ diff --git a/ash/wm/resize_shadow_and_cursor_unittest.cc b/ash/wm/resize_shadow_and_cursor_unittest.cc index 6431409..0503a82 100644 --- a/ash/wm/resize_shadow_and_cursor_unittest.cc +++ b/ash/wm/resize_shadow_and_cursor_unittest.cc @@ -74,9 +74,9 @@ class ResizeShadowAndCursorTest : public AshTestBase { // Returns the hit test code if there is a resize shadow. Returns HTNOWHERE if // there is no resize shadow. int ResizeShadowHitTest() const { - ash::internal::ResizeShadow* resize_shadow = - ash::Shell::GetInstance()->resize_shadow_controller()-> - GetShadowForWindowForTest(window_); + ash::ResizeShadow* resize_shadow = ash::Shell::GetInstance() + ->resize_shadow_controller() + ->GetShadowForWindowForTest(window_); return resize_shadow ? resize_shadow->GetLastHitTestForTest() : HTNOWHERE; } diff --git a/ash/wm/resize_shadow_controller.cc b/ash/wm/resize_shadow_controller.cc index 85778d3..e5ed6c3 100644 --- a/ash/wm/resize_shadow_controller.cc +++ b/ash/wm/resize_shadow_controller.cc @@ -10,7 +10,6 @@ #include "ui/aura/window.h" namespace ash { -namespace internal { ResizeShadowController::ResizeShadowController() { } @@ -70,5 +69,4 @@ ResizeShadow* ResizeShadowController::GetShadowForWindow(aura::Window* window) { return it != window_shadows_.end() ? it->second.get() : NULL; } -} // namespace internal } // namespace ash diff --git a/ash/wm/resize_shadow_controller.h b/ash/wm/resize_shadow_controller.h index 1eccf4c..2bd3f12 100644 --- a/ash/wm/resize_shadow_controller.h +++ b/ash/wm/resize_shadow_controller.h @@ -18,8 +18,6 @@ class Window; } namespace ash { -namespace internal { - class ResizeShadow; // ResizeShadowController observes changes to resizable windows and shows @@ -59,7 +57,6 @@ class ASH_EXPORT ResizeShadowController : public aura::WindowObserver { DISALLOW_COPY_AND_ASSIGN(ResizeShadowController); }; -} // namespace internal } // namespace ash #endif // ASH_WM_RESIZE_SHADOW_CONTROLLER_H_ diff --git a/ash/wm/root_window_layout_manager.cc b/ash/wm/root_window_layout_manager.cc index 2f7efda..282dbed 100644 --- a/ash/wm/root_window_layout_manager.cc +++ b/ash/wm/root_window_layout_manager.cc @@ -12,7 +12,6 @@ #include "ui/views/widget/widget.h" namespace ash { -namespace internal { //////////////////////////////////////////////////////////////////////////////// // RootWindowLayoutManager, public: @@ -79,5 +78,4 @@ void RootWindowLayoutManager::SetChildBounds( SetChildBoundsDirect(child, requested_bounds); } -} // namespace internal } // namespace ash diff --git a/ash/wm/root_window_layout_manager.h b/ash/wm/root_window_layout_manager.h index 708e306..d9fd297 100644 --- a/ash/wm/root_window_layout_manager.h +++ b/ash/wm/root_window_layout_manager.h @@ -25,7 +25,6 @@ class Widget; } namespace ash { -namespace internal { // A layout manager for the root window. // Resizes all of its immediate children to fill the bounds of the root window. @@ -50,7 +49,6 @@ class RootWindowLayoutManager : public aura::LayoutManager { DISALLOW_COPY_AND_ASSIGN(RootWindowLayoutManager); }; -} // namespace internal } // namespace ash #endif // ASH_WM_ROOT_WINDOW_LAYOUT_MANAGER_H_ diff --git a/ash/wm/screen_dimmer.cc b/ash/wm/screen_dimmer.cc index 4b4335e..b570c2d 100644 --- a/ash/wm/screen_dimmer.cc +++ b/ash/wm/screen_dimmer.cc @@ -13,8 +13,6 @@ #include "ui/gfx/size.h" namespace ash { -namespace internal { - namespace { // Opacity for |dimming_layer_| when it's dimming the screen. @@ -65,5 +63,4 @@ void ScreenDimmer::OnWindowBoundsChanged(aura::Window* root, dimming_layer_->SetBounds(gfx::Rect(root->bounds().size())); } -} // namespace internal } // namespace ash diff --git a/ash/wm/screen_dimmer.h b/ash/wm/screen_dimmer.h index abbb0a5..1d6e205 100644 --- a/ash/wm/screen_dimmer.h +++ b/ash/wm/screen_dimmer.h @@ -16,7 +16,6 @@ class Layer; } namespace ash { -namespace internal { // ScreenDimmer displays a partially-opaque layer above everything // else in the root window to darken the display. It shouldn't be used @@ -65,7 +64,6 @@ class ASH_EXPORT ScreenDimmer : public aura::WindowObserver { DISALLOW_COPY_AND_ASSIGN(ScreenDimmer); }; -} // namespace internal } // namespace ash #endif // ASH_WM_SCREEN_DIMMER_H_ diff --git a/ash/wm/screen_dimmer_unittest.cc b/ash/wm/screen_dimmer_unittest.cc index c339a9a..2ea4e96 100644 --- a/ash/wm/screen_dimmer_unittest.cc +++ b/ash/wm/screen_dimmer_unittest.cc @@ -23,13 +23,13 @@ class ScreenDimmerTest : public AshTestBase { virtual void SetUp() OVERRIDE { AshTestBase::SetUp(); dimmer_ = Shell::GetPrimaryRootWindowController()->screen_dimmer(); - test_api_.reset(new internal::ScreenDimmer::TestApi(dimmer_)); + test_api_.reset(new ScreenDimmer::TestApi(dimmer_)); } protected: - internal::ScreenDimmer* dimmer_; // not owned + ScreenDimmer* dimmer_; // not owned - scoped_ptr<internal::ScreenDimmer::TestApi> test_api_; + scoped_ptr<ScreenDimmer::TestApi> test_api_; private: DISALLOW_COPY_AND_ASSIGN(ScreenDimmerTest); diff --git a/ash/wm/session_state_animator.cc b/ash/wm/session_state_animator.cc index 586539c..9900275 100644 --- a/ash/wm/session_state_animator.cc +++ b/ash/wm/session_state_animator.cc @@ -15,8 +15,6 @@ #include "ui/views/widget/widget.h" namespace ash { -namespace internal { - namespace { // Slightly-smaller size that we scale the screen down to for the pre-lock and @@ -460,44 +458,38 @@ void SessionStateAnimator::GetContainers(int container_mask, if (container_mask & DESKTOP_BACKGROUND) { containers->push_back(Shell::GetContainer( - root_window, - internal::kShellWindowId_DesktopBackgroundContainer)); + root_window, kShellWindowId_DesktopBackgroundContainer)); } if (container_mask & LAUNCHER) { - containers->push_back(Shell::GetContainer( - root_window, - internal::kShellWindowId_ShelfContainer)); + containers->push_back( + Shell::GetContainer(root_window, kShellWindowId_ShelfContainer)); } if (container_mask & NON_LOCK_SCREEN_CONTAINERS) { // TODO(antrim): Figure out a way to eliminate a need to exclude launcher // in such way. aura::Window* non_lock_screen_containers = Shell::GetContainer( - root_window, - internal::kShellWindowId_NonLockScreenContainersContainer); + root_window, kShellWindowId_NonLockScreenContainersContainer); aura::Window::Windows children = non_lock_screen_containers->children(); for (aura::Window::Windows::const_iterator it = children.begin(); it != children.end(); ++it) { aura::Window* window = *it; - if (window->id() == internal::kShellWindowId_ShelfContainer) + if (window->id() == kShellWindowId_ShelfContainer) continue; containers->push_back(window); } } if (container_mask & LOCK_SCREEN_BACKGROUND) { containers->push_back(Shell::GetContainer( - root_window, - internal::kShellWindowId_LockScreenBackgroundContainer)); + root_window, kShellWindowId_LockScreenBackgroundContainer)); } if (container_mask & LOCK_SCREEN_CONTAINERS) { containers->push_back(Shell::GetContainer( - root_window, - internal::kShellWindowId_LockScreenContainersContainer)); + root_window, kShellWindowId_LockScreenContainersContainer)); } if (container_mask & LOCK_SCREEN_RELATED_CONTAINERS) { containers->push_back(Shell::GetContainer( - root_window, - internal::kShellWindowId_LockScreenRelatedContainersContainer)); + root_window, kShellWindowId_LockScreenRelatedContainersContainer)); } } @@ -613,5 +605,4 @@ void SessionStateAnimator::RunAnimationForWindow( } } -} // namespace internal } // namespace ash diff --git a/ash/wm/session_state_animator.h b/ash/wm/session_state_animator.h index 4cb183e..a9e43db4 100644 --- a/ash/wm/session_state_animator.h +++ b/ash/wm/session_state_animator.h @@ -22,7 +22,6 @@ class Layer; } namespace ash { -namespace internal { // Displays onscreen animations for session state changes (lock/unlock, sign // out, shut down). @@ -174,7 +173,6 @@ class ASH_EXPORT SessionStateAnimator { DISALLOW_COPY_AND_ASSIGN(SessionStateAnimator); }; -} // namespace internal } // namespace ash #endif // ASH_WM_SESSION_STATE_ANIMATOR_H_ diff --git a/ash/wm/stacking_controller.cc b/ash/wm/stacking_controller.cc index 62263d4..18eccce 100644 --- a/ash/wm/stacking_controller.cc +++ b/ash/wm/stacking_controller.cc @@ -44,10 +44,8 @@ bool HasTransientParentWindow(const aura::Window* window) { ui::wm::WINDOW_TYPE_UNKNOWN; } -internal::AlwaysOnTopController* -GetAlwaysOnTopController(aura::Window* root_window) { - return internal::GetRootWindowController(root_window)-> - always_on_top_controller(); +AlwaysOnTopController* GetAlwaysOnTopController(aura::Window* root_window) { + return GetRootWindowController(root_window)->always_on_top_controller(); } } // namespace @@ -82,24 +80,22 @@ aura::Window* StackingController::GetDefaultParent(aura::Window* context, if (IsSystemModal(window)) return GetSystemModalContainer(target_root, window); else if (HasTransientParentWindow(window)) - return internal::RootWindowController::GetContainerForWindow( + return RootWindowController::GetContainerForWindow( ::wm::GetTransientParent(window)); return GetAlwaysOnTopController(target_root)->GetContainer(window); case ui::wm::WINDOW_TYPE_CONTROL: - return GetContainerById( - target_root, internal::kShellWindowId_UnparentedControlContainer); + return GetContainerById(target_root, + kShellWindowId_UnparentedControlContainer); case ui::wm::WINDOW_TYPE_PANEL: if (wm::GetWindowState(window)->panel_attached()) - return GetContainerById(target_root, - internal::kShellWindowId_PanelContainer); + return GetContainerById(target_root, kShellWindowId_PanelContainer); else return GetAlwaysOnTopController(target_root)->GetContainer(window); case ui::wm::WINDOW_TYPE_MENU: - return GetContainerById( - target_root, internal::kShellWindowId_MenuContainer); + return GetContainerById(target_root, kShellWindowId_MenuContainer); case ui::wm::WINDOW_TYPE_TOOLTIP: - return GetContainerById( - target_root, internal::kShellWindowId_DragImageAndTooltipContainer); + return GetContainerById(target_root, + kShellWindowId_DragImageAndTooltipContainer); default: NOTREACHED() << "Window " << window->id() << " has unhandled type " << window->type(); @@ -124,8 +120,7 @@ aura::Window* StackingController::GetSystemModalContainer( Shell::GetInstance()->session_state_delegate(); if (!session_state_delegate->IsUserSessionBlocked() || !::wm::GetTransientParent(window)) { - return GetContainerById(root, - internal::kShellWindowId_SystemModalContainer); + return GetContainerById(root, kShellWindowId_SystemModalContainer); } // Otherwise those that originate from LockScreen container and above are @@ -133,12 +128,10 @@ aura::Window* StackingController::GetSystemModalContainer( int window_container_id = ::wm::GetTransientParent(window)->parent()->id(); aura::Window* container = NULL; - if (window_container_id < internal::kShellWindowId_LockScreenContainer) { - container = GetContainerById( - root, internal::kShellWindowId_SystemModalContainer); + if (window_container_id < kShellWindowId_LockScreenContainer) { + container = GetContainerById(root, kShellWindowId_SystemModalContainer); } else { - container = GetContainerById( - root, internal::kShellWindowId_LockSystemModalContainer); + container = GetContainerById(root, kShellWindowId_LockSystemModalContainer); } return container; diff --git a/ash/wm/stacking_controller.h b/ash/wm/stacking_controller.h index bbe715e..8c76aeb 100644 --- a/ash/wm/stacking_controller.h +++ b/ash/wm/stacking_controller.h @@ -12,9 +12,7 @@ #include "ui/aura/client/window_tree_client.h" namespace ash { -namespace internal { class AlwaysOnTopController; -} class ASH_EXPORT StackingController : public aura::client::WindowTreeClient { public: diff --git a/ash/wm/stacking_controller_unittest.cc b/ash/wm/stacking_controller_unittest.cc index c975169..c091e03 100644 --- a/ash/wm/stacking_controller_unittest.cc +++ b/ash/wm/stacking_controller_unittest.cc @@ -15,7 +15,6 @@ using aura::Window; namespace ash { -namespace internal { class StackingControllerTest : public test::AshTestBase { public: @@ -60,5 +59,4 @@ TEST_F(StackingControllerTest, TransientParent) { EXPECT_EQ(launcher, w1->parent()); } -} // namespace internal } // namespace ash diff --git a/ash/wm/status_area_layout_manager.cc b/ash/wm/status_area_layout_manager.cc index d9e0424..a1bf98e 100644 --- a/ash/wm/status_area_layout_manager.cc +++ b/ash/wm/status_area_layout_manager.cc @@ -12,7 +12,6 @@ #include "ui/views/widget/widget.h" namespace ash { -namespace internal { //////////////////////////////////////////////////////////////////////////////// // StatusAreaLayoutManager, public: @@ -77,5 +76,4 @@ void StatusAreaLayoutManager::LayoutStatusArea() { shelf_->shelf_layout_manager()->LayoutShelf(); } -} // namespace internal } // namespace ash diff --git a/ash/wm/status_area_layout_manager.h b/ash/wm/status_area_layout_manager.h index 8e6944d..9f255ce 100644 --- a/ash/wm/status_area_layout_manager.h +++ b/ash/wm/status_area_layout_manager.h @@ -11,7 +11,6 @@ namespace ash { class ShelfWidget; -namespace internal { // StatusAreaLayoutManager is a layout manager responsible for the status area. // In any case when status area needs relayout it redirects this call to @@ -45,7 +44,6 @@ class StatusAreaLayoutManager : public aura::LayoutManager { DISALLOW_COPY_AND_ASSIGN(StatusAreaLayoutManager); }; -} // namespace internal } // namespace ash #endif // ASH_WM_STATUS_AREA_LAYOUT_MANAGER_H_ diff --git a/ash/wm/system_background_controller.cc b/ash/wm/system_background_controller.cc index 7e4054e..86ec63d 100644 --- a/ash/wm/system_background_controller.cc +++ b/ash/wm/system_background_controller.cc @@ -9,7 +9,6 @@ #include "ui/compositor/layer_type.h" namespace ash { -namespace internal { SystemBackgroundController::SystemBackgroundController( aura::Window* root_window, @@ -41,5 +40,4 @@ void SystemBackgroundController::OnWindowBoundsChanged( layer_->SetBounds(gfx::Rect(root_window_->layer()->bounds().size())); } -} // namespace internal } // namespace ash diff --git a/ash/wm/system_background_controller.h b/ash/wm/system_background_controller.h index 8d74cdd..95c4d5c 100644 --- a/ash/wm/system_background_controller.h +++ b/ash/wm/system_background_controller.h @@ -18,7 +18,6 @@ class Layer; } namespace ash { -namespace internal { // SystemBackgroundController manages a ui::Layer that's stacked at the bottom // of an aura::RootWindow's children. It exists solely to obscure portions of @@ -48,7 +47,6 @@ class SystemBackgroundController : public aura::WindowObserver { DISALLOW_COPY_AND_ASSIGN(SystemBackgroundController); }; -} // namespace internal } // namespace ash #endif // ASH_WM_SYSTEM_BACKGROUND_CONTROLLER_H_ diff --git a/ash/wm/system_gesture_event_filter.cc b/ash/wm/system_gesture_event_filter.cc index 1c31832..e00a093 100644 --- a/ash/wm/system_gesture_event_filter.cc +++ b/ash/wm/system_gesture_event_filter.cc @@ -19,7 +19,6 @@ #endif namespace ash { -namespace internal { SystemGestureEventFilter::SystemGestureEventFilter() : long_press_affordance_(new LongPressAffordanceHandler), @@ -69,5 +68,4 @@ void SystemGestureEventFilter::OnGestureEvent(ui::GestureEvent* event) { } } -} // namespace internal } // namespace ash diff --git a/ash/wm/system_gesture_event_filter.h b/ash/wm/system_gesture_event_filter.h index 8fe82db..43bf758 100644 --- a/ash/wm/system_gesture_event_filter.h +++ b/ash/wm/system_gesture_event_filter.h @@ -9,16 +9,14 @@ #include "ui/events/event_handler.h" namespace ash { +class LongPressAffordanceHandler; +class OverviewGestureHandler; +class ShelfGestureHandler; namespace test { class SystemGestureEventFilterTest; } -namespace internal { -class LongPressAffordanceHandler; -class OverviewGestureHandler; -class ShelfGestureHandler; - // An event filter which handles system level gesture events. class SystemGestureEventFilter : public ui::EventHandler { public: @@ -41,7 +39,6 @@ class SystemGestureEventFilter : public ui::EventHandler { DISALLOW_COPY_AND_ASSIGN(SystemGestureEventFilter); }; -} // namespace internal } // namespace ash #endif // ASH_WM_SYSTEM_GESTURE_EVENT_FILTER_H_ diff --git a/ash/wm/system_gesture_event_filter_unittest.cc b/ash/wm/system_gesture_event_filter_unittest.cc index 39cdac8..47f46df 100644 --- a/ash/wm/system_gesture_event_filter_unittest.cc +++ b/ash/wm/system_gesture_event_filter_unittest.cc @@ -114,14 +114,14 @@ class SystemGestureEventFilterTest SystemGestureEventFilterTest() : AshTestBase(), docked_enabled_(GetParam()) {} virtual ~SystemGestureEventFilterTest() {} - internal::LongPressAffordanceHandler* GetLongPressAffordance() { + LongPressAffordanceHandler* GetLongPressAffordance() { ShellTestApi shell_test(Shell::GetInstance()); return shell_test.system_gesture_event_filter()-> long_press_affordance_.get(); } - base::OneShotTimer<internal::LongPressAffordanceHandler>* - GetLongPressAffordanceTimer() { + base::OneShotTimer<LongPressAffordanceHandler>* + GetLongPressAffordanceTimer() { return &GetLongPressAffordance()->timer_; } @@ -194,7 +194,7 @@ TEST_P(SystemGestureEventFilterTest, LongPressAffordanceStateOnCaptureLoss) { ASSERT_FALSE(details.dispatcher_destroyed); EXPECT_TRUE(window1->HasCapture()); - base::OneShotTimer<internal::LongPressAffordanceHandler>* timer = + base::OneShotTimer<LongPressAffordanceHandler>* timer = GetLongPressAffordanceTimer(); EXPECT_TRUE(timer->IsRunning()); EXPECT_EQ(window1, GetLongPressAffordanceTarget()); diff --git a/ash/wm/system_modal_container_event_filter.cc b/ash/wm/system_modal_container_event_filter.cc index 4412a9c..c8400cf 100644 --- a/ash/wm/system_modal_container_event_filter.cc +++ b/ash/wm/system_modal_container_event_filter.cc @@ -9,7 +9,6 @@ #include "ui/events/event.h" namespace ash { -namespace internal { SystemModalContainerEventFilter::SystemModalContainerEventFilter( SystemModalContainerEventFilterDelegate* delegate) @@ -32,5 +31,4 @@ void SystemModalContainerEventFilter::OnMouseEvent( event->StopPropagation(); } -} // namespace internal } // namespace ash diff --git a/ash/wm/system_modal_container_event_filter.h b/ash/wm/system_modal_container_event_filter.h index e1f2e8e..7c00d6f 100644 --- a/ash/wm/system_modal_container_event_filter.h +++ b/ash/wm/system_modal_container_event_filter.h @@ -11,7 +11,6 @@ #include "ui/events/event_handler.h" namespace ash { -namespace internal { class SystemModalContainerEventFilterDelegate; @@ -31,7 +30,6 @@ class ASH_EXPORT SystemModalContainerEventFilter : public ui::EventHandler { DISALLOW_COPY_AND_ASSIGN(SystemModalContainerEventFilter); }; -} // namespace internal } // namespace ash #endif // ASH_WM_SYSTEM_MODAL_CONTAINER_EVENT_FILTER_H_ diff --git a/ash/wm/system_modal_container_event_filter_delegate.h b/ash/wm/system_modal_container_event_filter_delegate.h index 4e27d00..a5765f6 100644 --- a/ash/wm/system_modal_container_event_filter_delegate.h +++ b/ash/wm/system_modal_container_event_filter_delegate.h @@ -12,7 +12,6 @@ class Window; } namespace ash { -namespace internal { class ASH_EXPORT SystemModalContainerEventFilterDelegate { public: @@ -20,7 +19,6 @@ class ASH_EXPORT SystemModalContainerEventFilterDelegate { virtual bool CanWindowReceiveEvents(aura::Window* window) = 0; }; -} // namespace internal } // namespace ash #endif // ASH_WM_MODALITY_EVENT_FILTER_DELEGATE_H_ diff --git a/ash/wm/system_modal_container_layout_manager.cc b/ash/wm/system_modal_container_layout_manager.cc index 6937501..89a7740 100644 --- a/ash/wm/system_modal_container_layout_manager.cc +++ b/ash/wm/system_modal_container_layout_manager.cc @@ -27,7 +27,6 @@ #include "ui/wm/core/compound_event_filter.h" namespace ash { -namespace internal { //////////////////////////////////////////////////////////////////////////////// // SystemModalContainerLayoutManager, public: @@ -66,7 +65,7 @@ void SystemModalContainerLayoutManager::OnWindowAddedToLayout( child->type() == ui::wm::WINDOW_TYPE_NORMAL || child->type() == ui::wm::WINDOW_TYPE_POPUP); DCHECK( - container_->id() != internal::kShellWindowId_LockSystemModalContainer || + container_->id() != kShellWindowId_LockSystemModalContainer || Shell::GetInstance()->session_state_delegate()->IsUserSessionBlocked()); child->AddObserver(this); @@ -133,7 +132,7 @@ bool SystemModalContainerLayoutManager::CanWindowReceiveEvents( // This container can not handle events if the screen is locked and it is not // above the lock screen layer (crbug.com/110920). if (Shell::GetInstance()->session_state_delegate()->IsUserSessionBlocked() && - container_->id() < ash::internal::kShellWindowId_LockScreenContainer) + container_->id() < ash::kShellWindowId_LockScreenContainer) return true; return wm::GetActivatableWindow(window) == modal_window(); } @@ -188,8 +187,8 @@ void SystemModalContainerLayoutManager::DestroyModalBackground() { bool SystemModalContainerLayoutManager::IsModalBackground( aura::Window* window) { int id = window->parent()->id(); - if (id != internal::kShellWindowId_SystemModalContainer && - id != internal::kShellWindowId_LockSystemModalContainer) + if (id != kShellWindowId_SystemModalContainer && + id != kShellWindowId_LockSystemModalContainer) return false; SystemModalContainerLayoutManager* layout_manager = static_cast<SystemModalContainerLayoutManager*>( @@ -220,5 +219,4 @@ void SystemModalContainerLayoutManager::RemoveModalWindow( modal_windows_.erase(it); } -} // namespace internal } // namespace ash diff --git a/ash/wm/system_modal_container_layout_manager.h b/ash/wm/system_modal_container_layout_manager.h index 76618ec..0833cc8 100644 --- a/ash/wm/system_modal_container_layout_manager.h +++ b/ash/wm/system_modal_container_layout_manager.h @@ -26,7 +26,6 @@ class Widget; } namespace ash { -namespace internal { // LayoutManager for the modal window container. class ASH_EXPORT SystemModalContainerLayoutManager @@ -92,7 +91,6 @@ class ASH_EXPORT SystemModalContainerLayoutManager DISALLOW_COPY_AND_ASSIGN(SystemModalContainerLayoutManager); }; -} // namespace internal } // namespace ash #endif // ASH_WM_SYSTEM_MODAL_CONTAINER_LAYOUT_MANAGER_H_ diff --git a/ash/wm/system_modal_container_layout_manager_unittest.cc b/ash/wm/system_modal_container_layout_manager_unittest.cc index af7c4f3..a150ef6 100644 --- a/ash/wm/system_modal_container_layout_manager_unittest.cc +++ b/ash/wm/system_modal_container_layout_manager_unittest.cc @@ -29,7 +29,7 @@ namespace { aura::Window* GetModalContainer() { return Shell::GetPrimaryRootWindowController()->GetContainer( - ash::internal::kShellWindowId_SystemModalContainer); + ash::kShellWindowId_SystemModalContainer); } bool AllRootWindowsHaveModalBackgroundsForContainer(int container_id) { @@ -38,21 +38,20 @@ bool AllRootWindowsHaveModalBackgroundsForContainer(int container_id) { bool has_modal_screen = !containers.empty(); for (std::vector<aura::Window*>::iterator iter = containers.begin(); iter != containers.end(); ++iter) { - has_modal_screen &= - static_cast<internal::SystemModalContainerLayoutManager*>( - (*iter)->layout_manager())->has_modal_background(); + has_modal_screen &= static_cast<SystemModalContainerLayoutManager*>( + (*iter)->layout_manager())->has_modal_background(); } return has_modal_screen; } bool AllRootWindowsHaveLockedModalBackgrounds() { return AllRootWindowsHaveModalBackgroundsForContainer( - internal::kShellWindowId_LockSystemModalContainer); + kShellWindowId_LockSystemModalContainer); } bool AllRootWindowsHaveModalBackgrounds() { return AllRootWindowsHaveModalBackgroundsForContainer( - internal::kShellWindowId_SystemModalContainer); + kShellWindowId_SystemModalContainer); } class TestWindow : public views::WidgetDelegateView { @@ -313,7 +312,7 @@ TEST_F(SystemModalContainerLayoutManagerTest, EventFocusContainers) { EventTestWindow* lock_delegate = new EventTestWindow(false); scoped_ptr<aura::Window> lock(lock_delegate->OpenTestWindowWithParent( Shell::GetPrimaryRootWindowController()->GetContainer( - ash::internal::kShellWindowId_LockScreenContainer))); + ash::kShellWindowId_LockScreenContainer))); EXPECT_TRUE(wm::IsActiveWindow(lock.get())); e1.ClickLeftButton(); EXPECT_EQ(1, lock_delegate->mouse_presses()); @@ -338,8 +337,10 @@ TEST_F(SystemModalContainerLayoutManagerTest, EventFocusContainers) { // is hidden. TEST_F(SystemModalContainerLayoutManagerTest, ShowModalWhileHidden) { // Hide the lock screen. - Shell::GetPrimaryRootWindowController()->GetContainer( - internal::kShellWindowId_SystemModalContainer)->layer()->SetOpacity(0); + Shell::GetPrimaryRootWindowController() + ->GetContainer(kShellWindowId_SystemModalContainer) + ->layer() + ->SetOpacity(0); // Create a modal window. scoped_ptr<aura::Window> parent(OpenToplevelTestWindow(false)); @@ -409,7 +410,7 @@ TEST_F(SystemModalContainerLayoutManagerTest, ShowNormalBackgroundOrLocked) { BlockUserSession(static_cast<UserSessionBlockReason>(block_reason)); scoped_ptr<aura::Window> lock_parent(OpenTestWindowWithParent( Shell::GetPrimaryRootWindowController()->GetContainer( - ash::internal::kShellWindowId_LockScreenContainer), + ash::kShellWindowId_LockScreenContainer), false)); scoped_ptr<aura::Window> lock_modal_window(OpenTestWindowWithParent( lock_parent.get(), true)); @@ -447,9 +448,9 @@ TEST_F(SystemModalContainerLayoutManagerTest, MultiDisplays) { aura::Window::Windows root_windows = Shell::GetAllRootWindows(); EXPECT_EQ(2U, root_windows.size()); aura::Window* container1 = Shell::GetContainer( - root_windows[0], ash::internal::kShellWindowId_SystemModalContainer); + root_windows[0], ash::kShellWindowId_SystemModalContainer); aura::Window* container2 = Shell::GetContainer( - root_windows[1], ash::internal::kShellWindowId_SystemModalContainer); + root_windows[1], ash::kShellWindowId_SystemModalContainer); scoped_ptr<aura::Window> modal1( OpenTestWindowWithParent(container1, true)); diff --git a/ash/wm/toplevel_window_event_handler.cc b/ash/wm/toplevel_window_event_handler.cc index 872fd03..8b6c9ba 100644 --- a/ash/wm/toplevel_window_event_handler.cc +++ b/ash/wm/toplevel_window_event_handler.cc @@ -232,14 +232,14 @@ void ToplevelWindowEventHandler::OnGestureEvent(ui::GestureEvent* event) { if (!(WindowResizer::GetBoundsChangeForWindowComponent(component) & WindowResizer::kBoundsChange_Resizes)) return; - internal::ResizeShadowController* controller = + ResizeShadowController* controller = Shell::GetInstance()->resize_shadow_controller(); if (controller) controller->ShowShadow(target, component); return; } case ui::ET_GESTURE_END: { - internal::ResizeShadowController* controller = + ResizeShadowController* controller = Shell::GetInstance()->resize_shadow_controller(); if (controller) controller->HideShadow(target); @@ -532,7 +532,7 @@ void ToplevelWindowEventHandler::HandleMouseMoved( // TODO(jamescook): Move the resize cursor update code into here from // CompoundEventFilter? - internal::ResizeShadowController* controller = + ResizeShadowController* controller = Shell::GetInstance()->resize_shadow_controller(); if (controller) { if (event->flags() & ui::EF_IS_NON_CLIENT) { @@ -554,7 +554,7 @@ void ToplevelWindowEventHandler::HandleMouseExited( if (event->phase() != ui::EP_POSTTARGET) return; - internal::ResizeShadowController* controller = + ResizeShadowController* controller = Shell::GetInstance()->resize_shadow_controller(); if (controller) controller->HideShadow(target); diff --git a/ash/wm/toplevel_window_event_handler_unittest.cc b/ash/wm/toplevel_window_event_handler_unittest.cc index a387067..3aa25ba 100644 --- a/ash/wm/toplevel_window_event_handler_unittest.cc +++ b/ash/wm/toplevel_window_event_handler_unittest.cc @@ -70,9 +70,8 @@ class ToplevelWindowEventHandlerTest : public AshTestBase { w1->SetType(ui::wm::WINDOW_TYPE_NORMAL); w1->set_id(1); w1->Init(aura::WINDOW_LAYER_TEXTURED); - aura::Window* parent = - Shell::GetContainer(Shell::GetPrimaryRootWindow(), - internal::kShellWindowId_AlwaysOnTopContainer); + aura::Window* parent = Shell::GetContainer( + Shell::GetPrimaryRootWindow(), kShellWindowId_AlwaysOnTopContainer); parent->AddChild(w1); w1->SetBounds(gfx::Rect(0, 0, 100, 100)); w1->Show(); @@ -477,8 +476,9 @@ TEST_F(ToplevelWindowEventHandlerTest, GestureDragMinimizeLoginScreen) { SetUserLoggedIn(false); scoped_ptr<aura::Window> target(CreateWindow(HTCAPTION)); - aura::Window* lock = internal::RootWindowController::ForWindow(target.get())-> - GetContainer(internal::kShellWindowId_LockSystemModalContainer); + aura::Window* lock = + RootWindowController::ForWindow(target.get()) + ->GetContainer(kShellWindowId_LockSystemModalContainer); lock->AddChild(target.get()); aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(), target.get()); diff --git a/ash/wm/video_detector.cc b/ash/wm/video_detector.cc index 38aef18..f0a7aaa 100644 --- a/ash/wm/video_detector.cc +++ b/ash/wm/video_detector.cc @@ -131,8 +131,8 @@ void VideoDetector::MaybeNotifyObservers(aura::Window* window, // http://crbug.com/340666 bool fullscreen_window_exists = false; std::vector<aura::Window*> containers = - Shell::GetContainersFromAllRootWindows( - internal::kShellWindowId_DefaultContainer, NULL); + Shell::GetContainersFromAllRootWindows(kShellWindowId_DefaultContainer, + NULL); for (std::vector<aura::Window*>::const_iterator container = containers.begin(); container != containers.end(); ++container) { const aura::Window::Windows& windows = (*container)->children(); diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc index 109aa1b..3d195ae 100644 --- a/ash/wm/window_animations.cc +++ b/ash/wm/window_animations.cc @@ -468,8 +468,7 @@ gfx::Rect GetMinimizeAnimationTargetBoundsInScreen(aura::Window* window) { // correctly and the window can be animated to the launcher item's light // bar. if (item_rect.width() != 0 || item_rect.height() != 0) { - internal::ShelfLayoutManager* layout_manager = - internal::ShelfLayoutManager::ForShelf(window); + ShelfLayoutManager* layout_manager = ShelfLayoutManager::ForShelf(window); if (layout_manager->visibility_state() == SHELF_AUTO_HIDE) { gfx::Rect shelf_bounds = shelf->shelf_widget()->GetWindowBoundsInScreen(); switch (layout_manager->GetAlignment()) { diff --git a/ash/wm/window_modality_controller_unittest.cc b/ash/wm/window_modality_controller_unittest.cc index c829171..910b369 100644 --- a/ash/wm/window_modality_controller_unittest.cc +++ b/ash/wm/window_modality_controller_unittest.cc @@ -20,7 +20,6 @@ #include "ui/wm/core/window_util.h" namespace ash { -namespace internal { typedef test::AshTestBase WindowModalityControllerTest; @@ -560,5 +559,4 @@ TEST_F(WindowModalityControllerTest, ChildModalAncestor) { EXPECT_TRUE(wm::IsActiveWindow(w4.get())); } -} // namespace internal } // namespace ash diff --git a/ash/wm/window_properties.cc b/ash/wm/window_properties.cc index ced25b2..1689c90 100644 --- a/ash/wm/window_properties.cc +++ b/ash/wm/window_properties.cc @@ -10,10 +10,10 @@ DECLARE_WINDOW_PROPERTY_TYPE(ash::wm::WindowState*); namespace ash { -namespace internal { + DEFINE_WINDOW_PROPERTY_KEY(bool, kStayInSameRootWindowKey, false); DEFINE_WINDOW_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false); DEFINE_OWNED_WINDOW_PROPERTY_KEY(wm::WindowState, kWindowStateKey, NULL); -} // namespace internal + } // namespace ash diff --git a/ash/wm/window_properties.h b/ash/wm/window_properties.h index 74ae495..c99d21d 100644 --- a/ash/wm/window_properties.h +++ b/ash/wm/window_properties.h @@ -19,7 +19,6 @@ namespace ash { namespace wm { class WindowState; } // namespace wm -namespace internal { // Shell-specific window property keys. @@ -40,7 +39,6 @@ extern const aura::WindowProperty<wm::WindowState*>* const kWindowStateKey; // Alphabetical sort. -} // namespace internal } // namespace ash #endif // ASH_WM_WINDOW_PROPERTIES_H_ diff --git a/ash/wm/window_resizer.cc b/ash/wm/window_resizer.cc index 14c1fd9..08ff0c4 100644 --- a/ash/wm/window_resizer.cc +++ b/ash/wm/window_resizer.cc @@ -142,10 +142,9 @@ gfx::Rect WindowResizer::CalculateBoundsForDrag( gfx::Rect work_area = Shell::GetScreen()->GetDisplayNearestWindow(GetTarget()).work_area(); aura::Window* dock_container = Shell::GetContainer( - GetTarget()->GetRootWindow(), - internal::kShellWindowId_DockedContainer); - internal::DockedWindowLayoutManager* dock_layout = - static_cast<internal::DockedWindowLayoutManager*>( + GetTarget()->GetRootWindow(), kShellWindowId_DockedContainer); + DockedWindowLayoutManager* dock_layout = + static_cast<DockedWindowLayoutManager*>( dock_container->layout_manager()); work_area.Union(dock_layout->docked_bounds()); @@ -211,11 +210,11 @@ gfx::Rect WindowResizer::CalculateBoundsForDrag( // calculate the target display after the drag. const gfx::Display& display = Shell::GetScreen()->GetDisplayMatching(near_passed_location); - aura::Window* dock_container = Shell::GetContainer( - wm::GetRootWindowMatching(near_passed_location), - internal::kShellWindowId_DockedContainer); - internal::DockedWindowLayoutManager* dock_layout = - static_cast<internal::DockedWindowLayoutManager*>( + aura::Window* dock_container = + Shell::GetContainer(wm::GetRootWindowMatching(near_passed_location), + kShellWindowId_DockedContainer); + DockedWindowLayoutManager* dock_layout = + static_cast<DockedWindowLayoutManager*>( dock_container->layout_manager()); gfx::Rect screen_work_area = display.work_area(); diff --git a/ash/wm/window_state.cc b/ash/wm/window_state.cc index 9af59ca..7714aca 100644 --- a/ash/wm/window_state.cc +++ b/ash/wm/window_state.cc @@ -150,7 +150,7 @@ bool WindowState::IsActive() const { bool WindowState::IsDocked() const { return window_->parent() && - window_->parent()->id() == internal::kShellWindowId_DockedContainer; + window_->parent()->id() == kShellWindowId_DockedContainer; } bool WindowState::CanMaximize() const { @@ -158,12 +158,11 @@ bool WindowState::CanMaximize() const { } bool WindowState::CanMinimize() const { - internal::RootWindowController* controller = - internal::RootWindowController::ForWindow(window_); + RootWindowController* controller = RootWindowController::ForWindow(window_); if (!controller) return false; - aura::Window* lockscreen = controller->GetContainer( - internal::kShellWindowId_LockScreenContainersContainer); + aura::Window* lockscreen = + controller->GetContainer(kShellWindowId_LockScreenContainersContainer); if (lockscreen->Contains(window_)) return false; @@ -418,10 +417,10 @@ WindowState* GetActiveWindowState() { WindowState* GetWindowState(aura::Window* window) { if (!window) return NULL; - WindowState* settings = window->GetProperty(internal::kWindowStateKey); + WindowState* settings = window->GetProperty(kWindowStateKey); if(!settings) { settings = new WindowState(window); - window->SetProperty(internal::kWindowStateKey, settings); + window->SetProperty(kWindowStateKey, settings); } return settings; } diff --git a/ash/wm/window_state.h b/ash/wm/window_state.h index 8bfb16e..4de1f9d 100644 --- a/ash/wm/window_state.h +++ b/ash/wm/window_state.h @@ -24,10 +24,8 @@ class Rect; } namespace ash { -namespace internal { class WorkspaceLayoutManager; class MaximizeModeWindowState; -} namespace wm { class WindowStateDelegate; @@ -296,7 +294,7 @@ class ASH_EXPORT WindowState : public aura::WindowObserver { private: friend class DefaultState; - friend class ash::internal::MaximizeModeWindowState; + friend class ash::MaximizeModeWindowState; FRIEND_TEST_ALL_PREFIXES(WindowAnimationsTest, CrossFadeToBounds); WindowStateDelegate* delegate() { return delegate_.get(); } diff --git a/ash/wm/workspace/magnetism_matcher.cc b/ash/wm/workspace/magnetism_matcher.cc index e7d674b..d486f61 100644 --- a/ash/wm/workspace/magnetism_matcher.cc +++ b/ash/wm/workspace/magnetism_matcher.cc @@ -8,8 +8,6 @@ #include <cmath> namespace ash { -namespace internal { - namespace { // Returns true if |a| is close enough to |b| that the two edges snap. @@ -190,5 +188,4 @@ void MagnetismMatcher::AttachToSecondaryEdge( } } -} // namespace internal } // namespace ash diff --git a/ash/wm/workspace/magnetism_matcher.h b/ash/wm/workspace/magnetism_matcher.h index ff1f528..5c17c7a58 100644 --- a/ash/wm/workspace/magnetism_matcher.h +++ b/ash/wm/workspace/magnetism_matcher.h @@ -15,7 +15,6 @@ #include "ui/gfx/rect.h" namespace ash { -namespace internal { enum MagnetismEdge { MAGNETISM_EDGE_TOP = 1 << 0, @@ -185,7 +184,6 @@ class ASH_EXPORT MagnetismMatcher { DISALLOW_COPY_AND_ASSIGN(MagnetismMatcher); }; -} // namespace internal } // namespace ash #endif // ASH_WM_WORKSPACE_MAGNETISM_MATCHER_H_ diff --git a/ash/wm/workspace/magnetism_matcher_unittest.cc b/ash/wm/workspace/magnetism_matcher_unittest.cc index 054622f..6c7ea9b 100644 --- a/ash/wm/workspace/magnetism_matcher_unittest.cc +++ b/ash/wm/workspace/magnetism_matcher_unittest.cc @@ -7,7 +7,6 @@ #include "testing/gtest/include/gtest/gtest.h" namespace ash { -namespace internal { // Trivial test case verifying assertions on left edge. TEST(MagnetismMatcherTest, TrivialLeft) { @@ -166,6 +165,5 @@ TEST(MagnetismMatcherTest, ObscureTrailing) { EXPECT_EQ(SECONDARY_MAGNETISM_EDGE_NONE, edge.secondary_edge); } -} // namespace internal } // namespace ash diff --git a/ash/wm/workspace/multi_window_resize_controller.cc b/ash/wm/workspace/multi_window_resize_controller.cc index df43914..347b117 100644 --- a/ash/wm/workspace/multi_window_resize_controller.cc +++ b/ash/wm/workspace/multi_window_resize_controller.cc @@ -29,8 +29,6 @@ using aura::Window; namespace ash { -namespace internal { - namespace { // Delay before showing. @@ -386,9 +384,8 @@ void MultiWindowResizeController::ShowNow() { views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP); params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; - params.parent = Shell::GetContainer( - Shell::GetTargetRootWindow(), - internal::kShellWindowId_AlwaysOnTopContainer); + params.parent = Shell::GetContainer(Shell::GetTargetRootWindow(), + kShellWindowId_AlwaysOnTopContainer); params.can_activate = false; ResizeView* view = new ResizeView(this, windows_.direction); resize_widget_->set_focus_on_creation(false); @@ -543,5 +540,4 @@ bool MultiWindowResizeController::IsOverWindow( window->delegate()->GetNonClientComponent(window_loc) == component; } -} // namespace internal } // namespace ash diff --git a/ash/wm/workspace/multi_window_resize_controller.h b/ash/wm/workspace/multi_window_resize_controller.h index 6dd342e..5e21b24 100644 --- a/ash/wm/workspace/multi_window_resize_controller.h +++ b/ash/wm/workspace/multi_window_resize_controller.h @@ -24,8 +24,6 @@ class Widget; } namespace ash { -namespace internal { - class MultiWindowResizeControllerTest; class WorkspaceWindowResizer; @@ -180,7 +178,6 @@ class ASH_EXPORT MultiWindowResizeController : DISALLOW_COPY_AND_ASSIGN(MultiWindowResizeController); }; -} // namespace internal } // namespace ash #endif // ASH_WM_WORKSPACE_MULTI_WINDOW_RESIZE_CONTROLLER_H_ diff --git a/ash/wm/workspace/multi_window_resize_controller_unittest.cc b/ash/wm/workspace/multi_window_resize_controller_unittest.cc index 056e7d2..9ff1d7c 100644 --- a/ash/wm/workspace/multi_window_resize_controller_unittest.cc +++ b/ash/wm/workspace/multi_window_resize_controller_unittest.cc @@ -19,7 +19,6 @@ #include "ui/views/widget/widget.h" namespace ash { -namespace internal { class MultiWindowResizeControllerTest : public test::AshTestBase { public: @@ -254,5 +253,5 @@ TEST_F(MultiWindowResizeControllerTest, Three) { EXPECT_TRUE(IsShowing()); generator.PressLeftButton(); } -} // namespace internal + } // namespace ash diff --git a/ash/wm/workspace/phantom_window_controller.cc b/ash/wm/workspace/phantom_window_controller.cc index f56575b..ba95423 100644 --- a/ash/wm/workspace/phantom_window_controller.cc +++ b/ash/wm/workspace/phantom_window_controller.cc @@ -24,8 +24,6 @@ #include "ui/views/widget/widget.h" namespace ash { -namespace internal { - namespace { // The duration of the show animation. @@ -289,5 +287,4 @@ scoped_ptr<views::Widget> PhantomWindowController::CreatePhantomWidget( return phantom_widget.Pass(); } -} // namespace internal } // namespace ash diff --git a/ash/wm/workspace/phantom_window_controller.h b/ash/wm/workspace/phantom_window_controller.h index fa87ef4..d62b135 100644 --- a/ash/wm/workspace/phantom_window_controller.h +++ b/ash/wm/workspace/phantom_window_controller.h @@ -19,7 +19,6 @@ class Widget; } namespace ash { -namespace internal { // PhantomWindowController is responsible for showing a phantom representation // of a window. It's used to show a preview of how snapping or docking a window @@ -81,7 +80,6 @@ class ASH_EXPORT PhantomWindowController { DISALLOW_COPY_AND_ASSIGN(PhantomWindowController); }; -} // namespace internal } // namespace ash #endif // ASH_WM_WORKSPACE_PHANTOM_WINDOW_CONTROLLER_H_ diff --git a/ash/wm/workspace/phantom_window_controller_unittest.cc b/ash/wm/workspace/phantom_window_controller_unittest.cc index 760db96..fa637d8 100644 --- a/ash/wm/workspace/phantom_window_controller_unittest.cc +++ b/ash/wm/workspace/phantom_window_controller_unittest.cc @@ -14,8 +14,6 @@ #include "ui/views/widget/widget.h" namespace ash { -namespace internal { - namespace { // Returns true if |window| is non-NULL and is visible. @@ -172,5 +170,4 @@ TEST_F(PhantomWindowControllerTest, OldCaptionButtonStyle) { EXPECT_FALSE(start_deletion_observer.IsWindowAlive()); } -} // namespace internal } // namespace ash diff --git a/ash/wm/workspace/two_step_edge_cycler.cc b/ash/wm/workspace/two_step_edge_cycler.cc index 76da2a1..3dd4437 100644 --- a/ash/wm/workspace/two_step_edge_cycler.cc +++ b/ash/wm/workspace/two_step_edge_cycler.cc @@ -7,8 +7,6 @@ #include <cmath> namespace ash { -namespace internal { - namespace { // We cycle to the second mode if any of the following happens while the mouse @@ -46,5 +44,4 @@ void TwoStepEdgeCycler::OnMove(const gfx::Point& location) { time_last_move_ = base::TimeTicks::Now(); } -} // namespace internal } // namespace ash diff --git a/ash/wm/workspace/two_step_edge_cycler.h b/ash/wm/workspace/two_step_edge_cycler.h index 007eda7..ffa1620 100644 --- a/ash/wm/workspace/two_step_edge_cycler.h +++ b/ash/wm/workspace/two_step_edge_cycler.h @@ -12,8 +12,6 @@ namespace ash { -namespace internal { - // TwoStepEdgeCycler is responsible for cycling between two modes when the mouse // is at the edge of the workspace. The cycler does not loop so it is impossible // to get back to the first mode once the second mode is reached. @@ -46,7 +44,6 @@ class ASH_EXPORT TwoStepEdgeCycler { DISALLOW_COPY_AND_ASSIGN(TwoStepEdgeCycler); }; -} // namespace internal } // namespace ash #endif // ASH_WM_WORKSPACE_TWO_STEP_EDGE_CYCLER_H_ diff --git a/ash/wm/workspace/workspace_event_handler.cc b/ash/wm/workspace/workspace_event_handler.cc index 65a8841..bfc8104 100644 --- a/ash/wm/workspace/workspace_event_handler.cc +++ b/ash/wm/workspace/workspace_event_handler.cc @@ -14,7 +14,6 @@ #include "ui/base/hit_test.h" namespace ash { -namespace internal { WorkspaceEventHandler::WorkspaceEventHandler() { } @@ -109,5 +108,4 @@ void WorkspaceEventHandler::HandleVerticalResizeDoubleClick( } } -} // namespace internal } // namespace ash diff --git a/ash/wm/workspace/workspace_event_handler.h b/ash/wm/workspace/workspace_event_handler.h index 65a05ac8..f949821 100644 --- a/ash/wm/workspace/workspace_event_handler.h +++ b/ash/wm/workspace/workspace_event_handler.h @@ -9,14 +9,12 @@ #include "ui/events/event_handler.h" namespace ash { +class WorkspaceEventHandlerTestHelper; + namespace wm { class WindowState; } -namespace internal { - -class WorkspaceEventHandlerTestHelper; - class WorkspaceEventHandler : public ui::EventHandler { public: WorkspaceEventHandler(); @@ -41,7 +39,6 @@ class WorkspaceEventHandler : public ui::EventHandler { DISALLOW_COPY_AND_ASSIGN(WorkspaceEventHandler); }; -} // namespace internal } // namespace ash #endif // ASH_WM_WORKSPACE_WORKSPACE_EVENT_HANDLER_H_ diff --git a/ash/wm/workspace/workspace_event_handler_test_helper.cc b/ash/wm/workspace/workspace_event_handler_test_helper.cc index 55b707b..485b102 100644 --- a/ash/wm/workspace/workspace_event_handler_test_helper.cc +++ b/ash/wm/workspace/workspace_event_handler_test_helper.cc @@ -5,7 +5,6 @@ #include "ash/wm/workspace/workspace_event_handler_test_helper.h" namespace ash { -namespace internal { WorkspaceEventHandlerTestHelper::WorkspaceEventHandlerTestHelper( WorkspaceEventHandler* handler) @@ -15,5 +14,4 @@ WorkspaceEventHandlerTestHelper::WorkspaceEventHandlerTestHelper( WorkspaceEventHandlerTestHelper::~WorkspaceEventHandlerTestHelper() { } -} // namespace internal } // namespace ash diff --git a/ash/wm/workspace/workspace_event_handler_test_helper.h b/ash/wm/workspace/workspace_event_handler_test_helper.h index 21e1adb..3d0ec95 100644 --- a/ash/wm/workspace/workspace_event_handler_test_helper.h +++ b/ash/wm/workspace/workspace_event_handler_test_helper.h @@ -8,7 +8,6 @@ #include "ash/wm/workspace/workspace_event_handler.h" namespace ash { -namespace internal { class WorkspaceEventHandlerTestHelper { public: @@ -25,7 +24,6 @@ class WorkspaceEventHandlerTestHelper { DISALLOW_COPY_AND_ASSIGN(WorkspaceEventHandlerTestHelper); }; -} // namespace internal } // namespace ash #endif // ASH_WM_WORKSPACE_WORKSPACE_EVENT_HANDLER_TEST_HELPER_H_ diff --git a/ash/wm/workspace/workspace_event_handler_unittest.cc b/ash/wm/workspace/workspace_event_handler_unittest.cc index f02830a..fe9ec8c 100644 --- a/ash/wm/workspace/workspace_event_handler_unittest.cc +++ b/ash/wm/workspace/workspace_event_handler_unittest.cc @@ -28,7 +28,6 @@ #endif namespace ash { -namespace internal { class WorkspaceEventHandlerTest : public test::AshTestBase { public: @@ -455,5 +454,4 @@ TEST_F(WorkspaceEventHandlerTest, DeleteWhileInRunLoop) { aura::client::WINDOW_MOVE_SOURCE_MOUSE); } -} // namespace internal } // namespace ash diff --git a/ash/wm/workspace/workspace_layout_manager.cc b/ash/wm/workspace/workspace_layout_manager.cc index 1b4b4af..c817141 100644 --- a/ash/wm/workspace/workspace_layout_manager.cc +++ b/ash/wm/workspace/workspace_layout_manager.cc @@ -32,8 +32,6 @@ using aura::Window; namespace ash { -namespace internal { - WorkspaceLayoutManager::WorkspaceLayoutManager(aura::Window* window) : shelf_(NULL), window_(window), @@ -57,7 +55,7 @@ WorkspaceLayoutManager::~WorkspaceLayoutManager() { Shell::GetInstance()->activation_client()->RemoveObserver(this); } -void WorkspaceLayoutManager::SetShelf(internal::ShelfLayoutManager* shelf) { +void WorkspaceLayoutManager::SetShelf(ShelfLayoutManager* shelf) { shelf_ = shelf; } @@ -281,5 +279,4 @@ void WorkspaceLayoutManager::UpdateFullscreenState() { } } -} // namespace internal } // namespace ash diff --git a/ash/wm/workspace/workspace_layout_manager.h b/ash/wm/workspace/workspace_layout_manager.h index 970f5e4..296e5ad 100644 --- a/ash/wm/workspace/workspace_layout_manager.h +++ b/ash/wm/workspace/workspace_layout_manager.h @@ -29,16 +29,14 @@ class Layer; } namespace ash { +class ShelfLayoutManager; +class WorkspaceLayoutManagerDelegate; + namespace wm { class WindowState; class WMEvent; } -namespace internal { - -class ShelfLayoutManager; -class WorkspaceLayoutManagerDelegate; - // LayoutManager used on the window created for a workspace. class ASH_EXPORT WorkspaceLayoutManager : public aura::LayoutManager, @@ -50,7 +48,7 @@ class ASH_EXPORT WorkspaceLayoutManager explicit WorkspaceLayoutManager(aura::Window* window); virtual ~WorkspaceLayoutManager(); - void SetShelf(internal::ShelfLayoutManager* shelf); + void SetShelf(ShelfLayoutManager* shelf); // A delegate which can be set to add a backdrop behind the top most visible // window. With the call the ownership of the delegate will be transferred to @@ -123,7 +121,7 @@ class ASH_EXPORT WorkspaceLayoutManager // Animates the window bounds to |bounds|. void SetChildBoundsAnimated(aura::Window* child, const gfx::Rect& bounds); - internal::ShelfLayoutManager* shelf_; + ShelfLayoutManager* shelf_; aura::Window* window_; aura::Window* root_window_; @@ -143,7 +141,6 @@ class ASH_EXPORT WorkspaceLayoutManager DISALLOW_COPY_AND_ASSIGN(WorkspaceLayoutManager); }; -} // namespace internal } // namespace ash #endif // ASH_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_ diff --git a/ash/wm/workspace/workspace_layout_manager_delegate.h b/ash/wm/workspace/workspace_layout_manager_delegate.h index a32c028..4cd1710 100644 --- a/ash/wm/workspace/workspace_layout_manager_delegate.h +++ b/ash/wm/workspace/workspace_layout_manager_delegate.h @@ -16,8 +16,6 @@ namespace wm { class WindowState; } -namespace internal { - // A delegate which can be set to create and control a backdrop which gets // placed below the top level window. class WorkspaceLayoutManagerDelegate { @@ -43,7 +41,6 @@ class WorkspaceLayoutManagerDelegate { wm::WindowStateType old_type) = 0; }; -} // namespace internal } // namespace ash #endif // ASH_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_DELEGATE_H_ diff --git a/ash/wm/workspace/workspace_layout_manager_unittest.cc b/ash/wm/workspace/workspace_layout_manager_unittest.cc index 1765b09..4af3056 100644 --- a/ash/wm/workspace/workspace_layout_manager_unittest.cc +++ b/ash/wm/workspace/workspace_layout_manager_unittest.cc @@ -371,8 +371,7 @@ TEST_F(WorkspaceLayoutManagerTest, MaximizeWithEmptySize) { NULL)); wm::GetWindowState(window.get())->Maximize(); aura::Window* default_container = Shell::GetContainer( - Shell::GetPrimaryRootWindow(), - internal::kShellWindowId_DefaultContainer); + Shell::GetPrimaryRootWindow(), kShellWindowId_DefaultContainer); default_container->AddChild(window.get()); window->Show(); gfx::Rect work_area( @@ -518,10 +517,9 @@ class WorkspaceLayoutManagerSoloTest : public test::AshTestBase { test::AshTestBase::SetUp(); UpdateDisplay("800x600"); aura::Window* default_container = Shell::GetContainer( - Shell::GetPrimaryRootWindow(), - internal::kShellWindowId_DefaultContainer); - default_container->SetLayoutManager(new internal::WorkspaceLayoutManager( - Shell::GetPrimaryRootWindow())); + Shell::GetPrimaryRootWindow(), kShellWindowId_DefaultContainer); + default_container->SetLayoutManager( + new WorkspaceLayoutManager(Shell::GetPrimaryRootWindow())); } aura::Window* CreateTestWindow(const gfx::Rect& bounds) { @@ -754,8 +752,7 @@ TEST_F(WorkspaceLayoutManagerSoloTest, NotResizeWhenScreenIsLocked) { window->SetProperty(aura::client::kAlwaysOnTopKey, true); window->Show(); - internal::ShelfLayoutManager* shelf = - internal::ShelfLayoutManager::ForShelf(window.get()); + ShelfLayoutManager* shelf = ShelfLayoutManager::ForShelf(window.get()); shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS); window->SetBounds(ScreenUtil::GetMaximizedWindowBoundsInParent(window.get())); @@ -787,9 +784,8 @@ class WorkspaceLayoutManagerBackdropTest : public test::AshTestBase { virtual void SetUp() OVERRIDE { test::AshTestBase::SetUp(); UpdateDisplay("800x600"); - default_container_ = Shell::GetContainer( - Shell::GetPrimaryRootWindow(), - internal::kShellWindowId_DefaultContainer); + default_container_ = Shell::GetContainer(Shell::GetPrimaryRootWindow(), + kShellWindowId_DefaultContainer); // We set the size to something smaller then the display to avoid resizing // issues with the shelf. default_container_->SetBounds(gfx::Rect(0, 0, 800, 500)); @@ -802,14 +798,12 @@ class WorkspaceLayoutManagerBackdropTest : public test::AshTestBase { // Turn the top window back drop on / off. void ShowTopWindowBackdrop(bool show) { - scoped_ptr<ash::internal::WorkspaceLayoutManagerDelegate> backdrop; + scoped_ptr<ash::WorkspaceLayoutManagerDelegate> backdrop; if (show) { - backdrop.reset(new ash::internal::WorkspaceBackdropDelegate( - default_container_)); + backdrop.reset(new ash::WorkspaceBackdropDelegate(default_container_)); } - (static_cast<internal::WorkspaceLayoutManager*> - (default_container_->layout_manager()))->SetMaximizeBackdropDelegate( - backdrop.Pass()); + (static_cast<WorkspaceLayoutManager*>(default_container_->layout_manager())) + ->SetMaximizeBackdropDelegate(backdrop.Pass()); // Closing and / or opening can be a delayed operation. base::MessageLoop::current()->RunUntilIdle(); } diff --git a/ash/wm/workspace/workspace_window_resizer.cc b/ash/wm/workspace/workspace_window_resizer.cc index 6223de3..75fedaa 100644 --- a/ash/wm/workspace/workspace_window_resizer.cc +++ b/ash/wm/workspace/workspace_window_resizer.cc @@ -84,33 +84,27 @@ scoped_ptr<WindowResizer> CreateWindowResizer( window_state->CreateDragDetails(window, point_in_parent, window_component, source); if (window->parent() && - (window->parent()->id() == internal::kShellWindowId_DefaultContainer || - window->parent()->id() == internal::kShellWindowId_DockedContainer || - window->parent()->id() == internal::kShellWindowId_PanelContainer)) { - window_resizer = internal::WorkspaceWindowResizer::Create( - window_state, - std::vector<aura::Window*>()); + (window->parent()->id() == kShellWindowId_DefaultContainer || + window->parent()->id() == kShellWindowId_DockedContainer || + window->parent()->id() == kShellWindowId_PanelContainer)) { + window_resizer = WorkspaceWindowResizer::Create( + window_state, std::vector<aura::Window*>()); } else { window_resizer = DefaultWindowResizer::Create(window_state); } - window_resizer = internal::DragWindowResizer::Create(window_resizer, - window_state); + window_resizer = DragWindowResizer::Create(window_resizer, window_state); if (window->type() == ui::wm::WINDOW_TYPE_PANEL) window_resizer = PanelWindowResizer::Create(window_resizer, window_state); - if (switches::UseDockedWindows() && - window_resizer && window->parent() && + if (switches::UseDockedWindows() && window_resizer && window->parent() && !::wm::GetTransientParent(window) && - (window->parent()->id() == internal::kShellWindowId_DefaultContainer || - window->parent()->id() == internal::kShellWindowId_DockedContainer || - window->parent()->id() == internal::kShellWindowId_PanelContainer)) { - window_resizer = internal::DockedWindowResizer::Create(window_resizer, - window_state); + (window->parent()->id() == kShellWindowId_DefaultContainer || + window->parent()->id() == kShellWindowId_DockedContainer || + window->parent()->id() == kShellWindowId_PanelContainer)) { + window_resizer = DockedWindowResizer::Create(window_resizer, window_state); } return make_scoped_ptr<WindowResizer>(window_resizer); } -namespace internal { - namespace { // Snapping distance used instead of WorkspaceWindowResizer::kScreenEdgeInset @@ -1047,5 +1041,4 @@ bool WorkspaceWindowResizer::AreBoundsValidSnappedBounds( return bounds_in_parent == snapped_bounds; } -} // namespace internal } // namespace ash diff --git a/ash/wm/workspace/workspace_window_resizer.h b/ash/wm/workspace/workspace_window_resizer.h index c16744a..d7d57d087 100644 --- a/ash/wm/workspace/workspace_window_resizer.h +++ b/ash/wm/workspace/workspace_window_resizer.h @@ -17,17 +17,15 @@ #include "ui/aura/window_tracker.h" namespace ash { -namespace wm { -class WindowState; -} - -namespace internal { - class DockedWindowLayoutManager; class PhantomWindowController; class TwoStepEdgeCycler; class WindowSize; +namespace wm { +class WindowState; +} + // WindowResizer implementation for workspaces. This enforces that windows are // not allowed to vertically move or resize outside of the work area. As windows // are moved outside the work area they are shrunk. We remember the height of @@ -222,7 +220,6 @@ class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer { DISALLOW_COPY_AND_ASSIGN(WorkspaceWindowResizer); }; -} // namespace internal } // namespace ash #endif // ASH_WM_WORKSPACE_WINDOW_RESIZER_H_ diff --git a/ash/wm/workspace/workspace_window_resizer_unittest.cc b/ash/wm/workspace/workspace_window_resizer_unittest.cc index 1b1a027..791e843 100644 --- a/ash/wm/workspace/workspace_window_resizer_unittest.cc +++ b/ash/wm/workspace/workspace_window_resizer_unittest.cc @@ -32,7 +32,6 @@ #include "ui/views/widget/widget.h" namespace ash { -namespace internal { namespace { const int kRootHeight = 600; @@ -183,7 +182,7 @@ class WorkspaceWindowResizerTest : public test::AshTestBase { return std::vector<aura::Window*>(); } - internal::ShelfLayoutManager* shelf_layout_manager() { + ShelfLayoutManager* shelf_layout_manager() { return Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager(); } @@ -1874,5 +1873,4 @@ TEST_F(WorkspaceWindowResizerTest, TouchResizeToEdge_BOTTOM) { touch_resize_window_->bounds().ToString()); } -} // namespace internal } // namespace ash diff --git a/ash/wm/workspace_controller.cc b/ash/wm/workspace_controller.cc index 96735be..5d3ae6e 100644 --- a/ash/wm/workspace_controller.cc +++ b/ash/wm/workspace_controller.cc @@ -24,7 +24,6 @@ #include "ui/wm/public/activation_client.h" namespace ash { -namespace internal { namespace { // Amount of time to pause before animating anything. Only used during initial @@ -70,10 +69,8 @@ WorkspaceWindowState WorkspaceController::GetWindowState() const { // These are the container ids of containers which may contain windows that // may overlap the launcher shelf and affect its transparency. - const int kWindowContainerIds[] = { - internal::kShellWindowId_DefaultContainer, - internal::kShellWindowId_DockedContainer, - }; + const int kWindowContainerIds[] = {kShellWindowId_DefaultContainer, + kShellWindowId_DockedContainer, }; const gfx::Rect shelf_bounds(shelf_->GetIdealBounds()); bool window_overlaps_launcher = false; for (size_t idx = 0; idx < arraysize(kWindowContainerIds); idx++) { @@ -141,5 +138,4 @@ void WorkspaceController::SetMaximizeBackdropDelegate( layout_manager_->SetMaximizeBackdropDelegate(delegate.Pass()); } -} // namespace internal } // namespace ash diff --git a/ash/wm/workspace_controller.h b/ash/wm/workspace_controller.h index 175ebe7..0529917 100644 --- a/ash/wm/workspace_controller.h +++ b/ash/wm/workspace_controller.h @@ -15,8 +15,6 @@ class Window; } namespace ash { -namespace internal { - class ShelfLayoutManager; class WorkspaceControllerTestHelper; class WorkspaceEventHandler; @@ -48,14 +46,13 @@ class ASH_EXPORT WorkspaceController { aura::Window* viewport_; - internal::ShelfLayoutManager* shelf_; - scoped_ptr<internal::WorkspaceEventHandler> event_handler_; - internal::WorkspaceLayoutManager* layout_manager_; + ShelfLayoutManager* shelf_; + scoped_ptr<WorkspaceEventHandler> event_handler_; + WorkspaceLayoutManager* layout_manager_; DISALLOW_COPY_AND_ASSIGN(WorkspaceController); }; -} // namespace internal } // namespace ash #endif // ASH_WM_WORKSPACE_CONTROLLER_H_ diff --git a/ash/wm/workspace_controller_test_helper.cc b/ash/wm/workspace_controller_test_helper.cc index 5ecfa2f..9cab7b5 100644 --- a/ash/wm/workspace_controller_test_helper.cc +++ b/ash/wm/workspace_controller_test_helper.cc @@ -9,7 +9,6 @@ #include "ui/aura/window.h" namespace ash { -namespace internal { WorkspaceControllerTestHelper::WorkspaceControllerTestHelper( WorkspaceController* controller) @@ -28,5 +27,4 @@ WorkspaceControllerTestHelper::GetMultiWindowResizeController() { return WorkspaceEventHandlerTestHelper(GetEventHandler()).resize_controller(); } -} // namespace internal } // namespace ash diff --git a/ash/wm/workspace_controller_test_helper.h b/ash/wm/workspace_controller_test_helper.h index ecdcccc..f020c35 100644 --- a/ash/wm/workspace_controller_test_helper.h +++ b/ash/wm/workspace_controller_test_helper.h @@ -8,8 +8,6 @@ #include "ash/wm/workspace_controller.h" namespace ash { -namespace internal { - class MultiWindowResizeController; class WorkspaceEventHandler; @@ -27,7 +25,6 @@ class WorkspaceControllerTestHelper { DISALLOW_COPY_AND_ASSIGN(WorkspaceControllerTestHelper); }; -} // namespace internal } // namespace ash #endif // ASH_WM_WORKSPACE_CONTROLLER_TEST_HELPER_H_ diff --git a/ash/wm/workspace_controller_unittest.cc b/ash/wm/workspace_controller_unittest.cc index 106ba52..09d1c94 100644 --- a/ash/wm/workspace_controller_unittest.cc +++ b/ash/wm/workspace_controller_unittest.cc @@ -41,7 +41,6 @@ using aura::Window; namespace ash { -namespace internal { // Returns a string containing the names of all the children of |window| (in // order). Each entry is separated by a space. @@ -128,11 +127,9 @@ class WorkspaceControllerTest : public test::AshTestBase { test::TestShelfDelegate* shelf_delegate = test::TestShelfDelegate::instance(); shelf_delegate->AddShelfItem(window); - PanelLayoutManager* manager = - static_cast<PanelLayoutManager*>( - Shell::GetContainer(window->GetRootWindow(), - internal::kShellWindowId_PanelContainer)-> - layout_manager()); + PanelLayoutManager* manager = static_cast<PanelLayoutManager*>( + Shell::GetContainer(window->GetRootWindow(), + kShellWindowId_PanelContainer)->layout_manager()); manager->Relayout(); return window; } @@ -1469,7 +1466,7 @@ TEST_F(WorkspaceControllerTest, WindowEdgeHitTestDocked) { 123, gfx::Rect(20, 10, 100, 50), NULL)); ParentWindowInPrimaryRootWindow(window.get()); aura::Window* docked_container = Shell::GetContainer( - window->GetRootWindow(), internal::kShellWindowId_DockedContainer); + window->GetRootWindow(), kShellWindowId_DockedContainer); docked_container->AddChild(window.get()); window->Show(); ui::EventTarget* root = window->GetRootWindow(); @@ -1508,5 +1505,4 @@ TEST_F(WorkspaceControllerTest, WindowEdgeHitTestDocked) { } } -} // namespace internal } // namespace ash |