OLD | NEW |
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 <gtk/gtk.h> | 5 #include <gtk/gtk.h> |
6 | 6 |
7 #include "chrome/browser/browser.h" | 7 #include "chrome/browser/browser.h" |
8 #include "chrome/browser/browser_window.h" | 8 #include "chrome/browser/browser_window.h" |
9 #include "chrome/browser/gtk/view_id_util.h" | 9 #include "chrome/browser/gtk/view_id_util.h" |
10 #include "chrome/test/in_process_browser_test.h" | 10 #include "chrome/test/in_process_browser_test.h" |
11 #include "chrome/test/ui_test_utils.h" | 11 #include "chrome/test/ui_test_utils.h" |
| 12 #include "net/test/test_server.h" |
12 | 13 |
13 namespace { | 14 namespace { |
14 | 15 |
15 const wchar_t kDocRoot[] = L"chrome/test/data"; | 16 const wchar_t kDocRoot[] = L"chrome/test/data"; |
16 const char kSimplePage[] = "404_is_enough_for_us.html"; | 17 const char kSimplePage[] = "404_is_enough_for_us.html"; |
17 | 18 |
18 void OnClicked(GtkWidget* widget, bool* clicked_bit) { | 19 void OnClicked(GtkWidget* widget, bool* clicked_bit) { |
19 *clicked_bit = true; | 20 *clicked_bit = true; |
20 } | 21 } |
21 | 22 |
22 } // namespace | 23 } // namespace |
23 | 24 |
24 class BookmarkBarGtkBrowserTest : public InProcessBrowserTest { | 25 class BookmarkBarGtkBrowserTest : public InProcessBrowserTest { |
25 }; | 26 }; |
26 | 27 |
27 // Makes sure that when you switch back to an NTP with an active findbar, | 28 // Makes sure that when you switch back to an NTP with an active findbar, |
28 // the findbar is above the floating bookmark bar. | 29 // the findbar is above the floating bookmark bar. |
29 IN_PROC_BROWSER_TEST_F(BookmarkBarGtkBrowserTest, FindBarTest) { | 30 IN_PROC_BROWSER_TEST_F(BookmarkBarGtkBrowserTest, FindBarTest) { |
30 scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot)); | 31 scoped_refptr<net::HTTPTestServer> server( |
| 32 net::HTTPTestServer::CreateServer(kDocRoot)); |
31 ASSERT_TRUE(NULL != server.get()); | 33 ASSERT_TRUE(NULL != server.get()); |
32 | 34 |
33 // Create new tab; open findbar. | 35 // Create new tab; open findbar. |
34 browser()->NewTab(); | 36 browser()->NewTab(); |
35 browser()->Find(); | 37 browser()->Find(); |
36 | 38 |
37 // Create new tab with an arbitrary URL. | 39 // Create new tab with an arbitrary URL. |
38 GURL url = server->TestServerPage(kSimplePage); | 40 GURL url = server->TestServerPage(kSimplePage); |
39 browser()->AddTabWithURL(url, GURL(), PageTransition::TYPED, -1, | 41 browser()->AddTabWithURL(url, GURL(), PageTransition::TYPED, -1, |
40 TabStripModel::ADD_SELECTED, NULL, std::string()); | 42 TabStripModel::ADD_SELECTED, NULL, std::string()); |
41 | 43 |
42 // Switch back to the NTP with the active findbar. | 44 // Switch back to the NTP with the active findbar. |
43 browser()->SelectTabContentsAt(1, false); | 45 browser()->SelectTabContentsAt(1, false); |
44 | 46 |
45 // Wait for the findbar to show. | 47 // Wait for the findbar to show. |
46 MessageLoop::current()->RunAllPending(); | 48 MessageLoop::current()->RunAllPending(); |
47 | 49 |
48 // Set focus somewhere else, so that we can test clicking on the findbar | 50 // Set focus somewhere else, so that we can test clicking on the findbar |
49 // works. | 51 // works. |
50 browser()->FocusLocationBar(); | 52 browser()->FocusLocationBar(); |
51 ui_test_utils::ClickOnView(browser(), VIEW_ID_FIND_IN_PAGE_TEXT_FIELD); | 53 ui_test_utils::ClickOnView(browser(), VIEW_ID_FIND_IN_PAGE_TEXT_FIELD); |
52 ui_test_utils::IsViewFocused(browser(), VIEW_ID_FIND_IN_PAGE_TEXT_FIELD); | 54 ui_test_utils::IsViewFocused(browser(), VIEW_ID_FIND_IN_PAGE_TEXT_FIELD); |
53 } | 55 } |
54 | 56 |
55 // Makes sure that you can click on the floating bookmark bar. | 57 // Makes sure that you can click on the floating bookmark bar. |
56 IN_PROC_BROWSER_TEST_F(BookmarkBarGtkBrowserTest, ClickOnFloatingTest) { | 58 IN_PROC_BROWSER_TEST_F(BookmarkBarGtkBrowserTest, ClickOnFloatingTest) { |
57 scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot)); | 59 scoped_refptr<net::HTTPTestServer> server( |
| 60 net::HTTPTestServer::CreateServer(kDocRoot)); |
58 ASSERT_TRUE(NULL != server.get()); | 61 ASSERT_TRUE(NULL != server.get()); |
59 | 62 |
60 GtkWidget* other_bookmarks = | 63 GtkWidget* other_bookmarks = |
61 ViewIDUtil::GetWidget(GTK_WIDGET(browser()->window()->GetNativeHandle()), | 64 ViewIDUtil::GetWidget(GTK_WIDGET(browser()->window()->GetNativeHandle()), |
62 VIEW_ID_OTHER_BOOKMARKS); | 65 VIEW_ID_OTHER_BOOKMARKS); |
63 bool has_been_clicked = false; | 66 bool has_been_clicked = false; |
64 g_signal_connect(other_bookmarks, "clicked", | 67 g_signal_connect(other_bookmarks, "clicked", |
65 G_CALLBACK(OnClicked), &has_been_clicked); | 68 G_CALLBACK(OnClicked), &has_been_clicked); |
66 | 69 |
67 // Create new tab. | 70 // Create new tab. |
68 browser()->NewTab(); | 71 browser()->NewTab(); |
69 | 72 |
70 // Wait for the floating bar to appear. | 73 // Wait for the floating bar to appear. |
71 MessageLoop::current()->RunAllPending(); | 74 MessageLoop::current()->RunAllPending(); |
72 | 75 |
73 // This is kind of a hack. Calling this just once doesn't seem to send a click | 76 // This is kind of a hack. Calling this just once doesn't seem to send a click |
74 // event, but doing it twice works. | 77 // event, but doing it twice works. |
75 // http://crbug.com/35581 | 78 // http://crbug.com/35581 |
76 ui_test_utils::ClickOnView(browser(), VIEW_ID_OTHER_BOOKMARKS); | 79 ui_test_utils::ClickOnView(browser(), VIEW_ID_OTHER_BOOKMARKS); |
77 ui_test_utils::ClickOnView(browser(), VIEW_ID_OTHER_BOOKMARKS); | 80 ui_test_utils::ClickOnView(browser(), VIEW_ID_OTHER_BOOKMARKS); |
78 | 81 |
79 EXPECT_TRUE(has_been_clicked); | 82 EXPECT_TRUE(has_been_clicked); |
80 } | 83 } |
OLD | NEW |