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

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

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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
« no previous file with comments | « chrome/browser/ui/views/tabs/tab.cc ('k') | chrome/browser/ui/views/tabs/tab_strip.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/file_util.h" 6 #include "base/file_util.h"
7 #include "chrome/app/chrome_command_ids.h" 7 #include "chrome/app/chrome_command_ids.h"
8 #include "chrome/browser/ui/view_ids.h" 8 #include "chrome/browser/ui/view_ids.h"
9 #include "chrome/common/chrome_paths.h" 9 #include "chrome/common/chrome_paths.h"
10 #include "chrome/test/automation/tab_proxy.h" 10 #include "chrome/test/automation/tab_proxy.h"
11 #include "chrome/test/automation/browser_proxy.h" 11 #include "chrome/test/automation/browser_proxy.h"
12 #include "chrome/test/automation/window_proxy.h" 12 #include "chrome/test/automation/window_proxy.h"
13 #include "chrome/test/ui/ui_test.h" 13 #include "chrome/test/ui/ui_test.h"
14 #include "gfx/rect.h"
15 #include "googleurl/src/gurl.h" 14 #include "googleurl/src/gurl.h"
16 #include "net/base/net_util.h" 15 #include "net/base/net_util.h"
16 #include "ui/gfx/rect.h"
17 #include "views/event.h" 17 #include "views/event.h"
18 18
19 #if defined(OS_LINUX) 19 #if defined(OS_LINUX)
20 // This test doesn't make sense on chromeos as chromeos doesn't allow dragging 20 // This test doesn't make sense on chromeos as chromeos doesn't allow dragging
21 // tabs out. 21 // tabs out.
22 #define MAYBE_Tab2OutOfTabStrip DISABLED_Tab2OutOfTabStrip 22 #define MAYBE_Tab2OutOfTabStrip DISABLED_Tab2OutOfTabStrip
23 #else 23 #else
24 // Flaky, http://crbug.com/62311. 24 // Flaky, http://crbug.com/62311.
25 #define MAYBE_Tab2OutOfTabStrip FLAKY_Tab2OutOfTabStrip 25 #define MAYBE_Tab2OutOfTabStrip FLAKY_Tab2OutOfTabStrip
26 #endif 26 #endif
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after
504 scoped_refptr<TabProxy> tab1_2(browser2->GetTab(0)); 504 scoped_refptr<TabProxy> tab1_2(browser2->GetTab(0));
505 ASSERT_TRUE(tab1_2.get()); 505 ASSERT_TRUE(tab1_2.get());
506 GURL tab1_2_url; 506 GURL tab1_2_url;
507 ASSERT_TRUE(tab1_2->GetCurrentURL(&tab1_2_url)); 507 ASSERT_TRUE(tab1_2->GetCurrentURL(&tab1_2_url));
508 508
509 // Tab_1_2 of Window 2 should essentially be Tab_2 of Window 1. 509 // Tab_1_2 of Window 2 should essentially be Tab_2 of Window 1.
510 EXPECT_EQ(tab1_2_url.spec(), tab2_url.spec()); 510 EXPECT_EQ(tab1_2_url.spec(), tab2_url.spec());
511 EXPECT_NE(tab1_2_url.spec(), tab1_url.spec()); 511 EXPECT_NE(tab1_2_url.spec(), tab1_url.spec());
512 EXPECT_NE(tab1_2_url.spec(), tab3_url.spec()); 512 EXPECT_NE(tab1_2_url.spec(), tab3_url.spec());
513 } 513 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tabs/tab.cc ('k') | chrome/browser/ui/views/tabs/tab_strip.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698