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

Side by Side Diff: chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc

Issue 224113005: Eliminate ash::internal namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h" 5 #include "chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h"
6 6
7 #include "ash/wm/window_state.h" 7 #include "ash/wm/window_state.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 2000 matching lines...) Expand 10 before | Expand all | Expand 10 after
2011 2011
2012 // Invoked from the nested message loop. 2012 // Invoked from the nested message loop.
2013 void CancelDragTabToWindowInSeparateDisplayStep3( 2013 void CancelDragTabToWindowInSeparateDisplayStep3(
2014 TabStrip* tab_strip, 2014 TabStrip* tab_strip,
2015 const BrowserList* browser_list) { 2015 const BrowserList* browser_list) {
2016 ASSERT_FALSE(tab_strip->IsDragSessionActive()); 2016 ASSERT_FALSE(tab_strip->IsDragSessionActive());
2017 ASSERT_TRUE(TabDragController::IsActive()); 2017 ASSERT_TRUE(TabDragController::IsActive());
2018 ASSERT_EQ(2u, browser_list->size()); 2018 ASSERT_EQ(2u, browser_list->size());
2019 2019
2020 // Switching display mode should cancel the drag operation. 2020 // Switching display mode should cancel the drag operation.
2021 ash::internal::DisplayManager* display_manager = 2021 ash::DisplayManager* display_manager =
2022 ash::Shell::GetInstance()->display_manager(); 2022 ash::Shell::GetInstance()->display_manager();
2023 display_manager->AddRemoveDisplay(); 2023 display_manager->AddRemoveDisplay();
2024 } 2024 }
2025 2025
2026 // Invoked from the nested message loop. 2026 // Invoked from the nested message loop.
2027 void CancelDragTabToWindowInSeparateDisplayStep2( 2027 void CancelDragTabToWindowInSeparateDisplayStep2(
2028 DetachToBrowserInSeparateDisplayAndCancelTabDragControllerTest* test, 2028 DetachToBrowserInSeparateDisplayAndCancelTabDragControllerTest* test,
2029 TabStrip* tab_strip, 2029 TabStrip* tab_strip,
2030 aura::Window* current_root, 2030 aura::Window* current_root,
2031 gfx::Point final_destination, 2031 gfx::Point final_destination,
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
2331 DetachToDockedTabDragControllerTest, 2331 DetachToDockedTabDragControllerTest,
2332 ::testing::Values("mouse", "mouse docked")); 2332 ::testing::Values("mouse", "mouse docked"));
2333 INSTANTIATE_TEST_CASE_P(TabDragging, 2333 INSTANTIATE_TEST_CASE_P(TabDragging,
2334 DetachToBrowserTabDragControllerTestTouch, 2334 DetachToBrowserTabDragControllerTestTouch,
2335 ::testing::Values("touch", "touch docked")); 2335 ::testing::Values("touch", "touch docked"));
2336 #else 2336 #else
2337 INSTANTIATE_TEST_CASE_P(TabDragging, 2337 INSTANTIATE_TEST_CASE_P(TabDragging,
2338 DetachToBrowserTabDragControllerTest, 2338 DetachToBrowserTabDragControllerTest,
2339 ::testing::Values("mouse")); 2339 ::testing::Values("mouse"));
2340 #endif 2340 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698