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

Unified Diff: chrome/browser/ui/panels/old_panel_drag_browsertest.cc

Issue 10544105: Modify old Panel test files and include them in .gyp. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: exclude new panel browser tests files from chromeos Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/panels/old_panel_drag_browsertest.cc
diff --git a/chrome/browser/ui/panels/old_panel_drag_browsertest.cc b/chrome/browser/ui/panels/old_panel_drag_browsertest.cc
index a9b551e15a79cd2c34570caf8d2522c36f8ff8cb..cb348c2f6d361c2471fac88ba265cc62ba34956b 100644
--- a/chrome/browser/ui/panels/old_panel_drag_browsertest.cc
+++ b/chrome/browser/ui/panels/old_panel_drag_browsertest.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "base/message_loop.h"
-#include "chrome/browser/ui/panels/base_panel_browser_test.h"
+#include "chrome/browser/ui/panels/old_base_panel_browser_test.h"
#include "chrome/browser/ui/panels/detached_panel_strip.h"
#include "chrome/browser/ui/panels/docked_panel_strip.h"
#include "chrome/browser/ui/panels/native_panel.h"
@@ -12,16 +12,16 @@
#include "chrome/browser/ui/panels/panel_manager.h"
#include "chrome/browser/ui/panels/test_panel_mouse_watcher.h"
-class PanelDragBrowserTest : public BasePanelBrowserTest {
+class OldPanelDragBrowserTest : public OldBasePanelBrowserTest {
public:
- PanelDragBrowserTest() : BasePanelBrowserTest() {
+ OldPanelDragBrowserTest() : OldBasePanelBrowserTest() {
}
- virtual ~PanelDragBrowserTest() {
+ virtual ~OldPanelDragBrowserTest() {
}
virtual void SetUpOnMainThread() OVERRIDE {
- BasePanelBrowserTest::SetUpOnMainThread();
+ OldBasePanelBrowserTest::SetUpOnMainThread();
// All the tests here assume using mocked 800x600 screen area for the
// primary monitor. Do the check now.
@@ -81,7 +81,7 @@ class PanelDragBrowserTest : public BasePanelBrowserTest {
}
};
-IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DragOneDockedPanel) {
+IN_PROC_BROWSER_TEST_F(OldPanelDragBrowserTest, DragOneDockedPanel) {
static const int big_delta_x = 70;
static const int big_delta_y = 30; // Do not exceed the threshold to detach.
@@ -173,7 +173,7 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DragOneDockedPanel) {
PanelManager::GetInstance()->CloseAll();
}
-IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DragTwoDockedPanels) {
+IN_PROC_BROWSER_TEST_F(OldPanelDragBrowserTest, DragTwoDockedPanels) {
static const gfx::Point small_delta(10, 0);
Panel* panel1 = CreateDockedPanel("1", gfx::Rect(0, 0, 100, 100));
@@ -269,7 +269,7 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DragTwoDockedPanels) {
PanelManager::GetInstance()->CloseAll();
}
-IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DragThreeDockedPanels) {
+IN_PROC_BROWSER_TEST_F(OldPanelDragBrowserTest, DragThreeDockedPanels) {
Panel* panel1 = CreateDockedPanel("1", gfx::Rect(0, 0, 100, 100));
Panel* panel2 = CreateDockedPanel("2", gfx::Rect(0, 0, 100, 100));
Panel* panel3 = CreateDockedPanel("3", gfx::Rect(0, 0, 100, 100));
@@ -402,7 +402,7 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DragThreeDockedPanels) {
PanelManager::GetInstance()->CloseAll();
}
-IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DragMinimizedPanel) {
+IN_PROC_BROWSER_TEST_F(OldPanelDragBrowserTest, DragMinimizedPanel) {
// We'll simulate mouse movements for test.
PanelMouseWatcher* mouse_watcher = new TestPanelMouseWatcher();
PanelManager::GetInstance()->SetMouseWatcherForTesting(mouse_watcher);
@@ -444,7 +444,7 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DragMinimizedPanel) {
panel->Close();
}
-IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest,
+IN_PROC_BROWSER_TEST_F(OldPanelDragBrowserTest,
DragMinimizedPanelWhileDrawingAttention) {
// We'll simulate mouse movements for test.
PanelMouseWatcher* mouse_watcher = new TestPanelMouseWatcher();
@@ -492,7 +492,7 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest,
PanelManager::GetInstance()->CloseAll();
}
-IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, CloseDockedPanelOnDrag) {
+IN_PROC_BROWSER_TEST_F(OldPanelDragBrowserTest, CloseDockedPanelOnDrag) {
PanelManager* panel_manager = PanelManager::GetInstance();
PanelDragController* drag_controller = panel_manager->drag_controller();
DockedPanelStrip* docked_strip = panel_manager->docked_strip();
@@ -656,7 +656,7 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, CloseDockedPanelOnDrag) {
panel_manager->CloseAll();
}
-IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DragOneDetachedPanel) {
+IN_PROC_BROWSER_TEST_F(OldPanelDragBrowserTest, DragOneDetachedPanel) {
Panel* panel = CreateDetachedPanel("1", gfx::Rect(300, 200, 250, 200));
// Test that the detached panel can be dragged almost anywhere except getting
@@ -702,7 +702,7 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DragOneDetachedPanel) {
PanelManager::GetInstance()->CloseAll();
}
-IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, CloseDetachedPanelOnDrag) {
+IN_PROC_BROWSER_TEST_F(OldPanelDragBrowserTest, CloseDetachedPanelOnDrag) {
PanelManager* panel_manager = PanelManager::GetInstance();
PanelDragController* drag_controller = panel_manager->drag_controller();
DetachedPanelStrip* detached_strip = panel_manager->detached_strip();
@@ -841,7 +841,7 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, CloseDetachedPanelOnDrag) {
panel_manager->CloseAll();
}
-IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, Detach) {
+IN_PROC_BROWSER_TEST_F(OldPanelDragBrowserTest, Detach) {
PanelManager* panel_manager = PanelManager::GetInstance();
DockedPanelStrip* docked_strip = panel_manager->docked_strip();
DetachedPanelStrip* detached_strip = panel_manager->detached_strip();
@@ -896,7 +896,7 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, Detach) {
panel_manager->CloseAll();
}
-IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DetachAndCancel) {
+IN_PROC_BROWSER_TEST_F(OldPanelDragBrowserTest, DetachAndCancel) {
PanelManager* panel_manager = PanelManager::GetInstance();
DockedPanelStrip* docked_strip = panel_manager->docked_strip();
DetachedPanelStrip* detached_strip = panel_manager->detached_strip();
@@ -951,7 +951,7 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DetachAndCancel) {
panel_manager->CloseAll();
}
-IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, Attach) {
+IN_PROC_BROWSER_TEST_F(OldPanelDragBrowserTest, Attach) {
PanelManager* panel_manager = PanelManager::GetInstance();
DockedPanelStrip* docked_strip = panel_manager->docked_strip();
DetachedPanelStrip* detached_strip = panel_manager->detached_strip();
@@ -1010,7 +1010,7 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, Attach) {
panel_manager->CloseAll();
}
-IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, AttachAndCancel) {
+IN_PROC_BROWSER_TEST_F(OldPanelDragBrowserTest, AttachAndCancel) {
PanelManager* panel_manager = PanelManager::GetInstance();
DockedPanelStrip* docked_strip = panel_manager->docked_strip();
DetachedPanelStrip* detached_strip = panel_manager->detached_strip();
@@ -1065,7 +1065,7 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, AttachAndCancel) {
panel_manager->CloseAll();
}
-IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DetachAttachAndCancel) {
+IN_PROC_BROWSER_TEST_F(OldPanelDragBrowserTest, DetachAttachAndCancel) {
PanelManager* panel_manager = PanelManager::GetInstance();
DockedPanelStrip* docked_strip = panel_manager->docked_strip();
DetachedPanelStrip* detached_strip = panel_manager->detached_strip();
@@ -1126,7 +1126,7 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DetachAttachAndCancel) {
panel_manager->CloseAll();
}
-IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DetachWithSqueeze) {
+IN_PROC_BROWSER_TEST_F(OldPanelDragBrowserTest, DetachWithSqueeze) {
PanelManager* panel_manager = PanelManager::GetInstance();
DockedPanelStrip* docked_strip = panel_manager->docked_strip();
DetachedPanelStrip* detached_strip = panel_manager->detached_strip();
@@ -1207,7 +1207,7 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DetachWithSqueeze) {
panel_manager->CloseAll();
}
-IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, AttachWithSqueeze) {
+IN_PROC_BROWSER_TEST_F(OldPanelDragBrowserTest, AttachWithSqueeze) {
PanelManager* panel_manager = PanelManager::GetInstance();
DockedPanelStrip* docked_strip = panel_manager->docked_strip();
DetachedPanelStrip* detached_strip = panel_manager->detached_strip();
@@ -1315,7 +1315,7 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, AttachWithSqueeze) {
panel_manager->CloseAll();
}
-IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DragDetachedPanelToTop) {
+IN_PROC_BROWSER_TEST_F(OldPanelDragBrowserTest, DragDetachedPanelToTop) {
// Setup the test areas to have top-aligned bar excluded from work area.
const gfx::Rect primary_screen_area(0, 0, 800, 600);
const gfx::Rect work_area(0, 10, 800, 590);
« no previous file with comments | « chrome/browser/ui/panels/old_panel_browsertest.cc ('k') | chrome/browser/ui/panels/old_panel_resize_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698