OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/translate/translate_bubble_view.h" | 5 #include "chrome/browser/ui/views/translate/translate_bubble_view.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "chrome/browser/chrome_notification_types.h" | 9 #include "chrome/browser/chrome_notification_types.h" |
10 #include "chrome/browser/translate/cld_data_harness.h" | 10 #include "chrome/browser/translate/cld_data_harness.h" |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
52 base::FilePath(), base::FilePath(FILE_PATH_LITERAL("french_page.html"))); | 52 base::FilePath(), base::FilePath(FILE_PATH_LITERAL("french_page.html"))); |
53 ui_test_utils::NavigateToURL(browser(), french_url); | 53 ui_test_utils::NavigateToURL(browser(), french_url); |
54 fr_language_detected_signal.Wait(); | 54 fr_language_detected_signal.Wait(); |
55 EXPECT_TRUE(TranslateBubbleView::IsShowing()); | 55 EXPECT_TRUE(TranslateBubbleView::IsShowing()); |
56 | 56 |
57 // Close the window without translating. | 57 // Close the window without translating. |
58 chrome::CloseWindow(browser()); | 58 chrome::CloseWindow(browser()); |
59 EXPECT_FALSE(TranslateBubbleView::IsShowing()); | 59 EXPECT_FALSE(TranslateBubbleView::IsShowing()); |
60 } | 60 } |
61 | 61 |
| 62 // http://crbug.com/378061 |
62 IN_PROC_BROWSER_TEST_F(TranslateBubbleViewBrowserTest, | 63 IN_PROC_BROWSER_TEST_F(TranslateBubbleViewBrowserTest, |
63 CloseLastTabWithoutTranslating) { | 64 DISABLED_CloseLastTabWithoutTranslating) { |
64 EXPECT_FALSE(TranslateBubbleView::IsShowing()); | 65 EXPECT_FALSE(TranslateBubbleView::IsShowing()); |
65 | 66 |
66 // Show a French page and wait until the bubble is shown. | 67 // Show a French page and wait until the bubble is shown. |
67 content::WebContents* current_web_contents = | 68 content::WebContents* current_web_contents = |
68 browser()->tab_strip_model()->GetActiveWebContents(); | 69 browser()->tab_strip_model()->GetActiveWebContents(); |
69 content::Source<content::WebContents> source(current_web_contents); | 70 content::Source<content::WebContents> source(current_web_contents); |
70 ui_test_utils::WindowedNotificationObserverWithDetails< | 71 ui_test_utils::WindowedNotificationObserverWithDetails< |
71 translate::LanguageDetectionDetails> | 72 translate::LanguageDetectionDetails> |
72 fr_language_detected_signal(chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED, | 73 fr_language_detected_signal(chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED, |
73 source); | 74 source); |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
114 chrome::CloseWebContents(browser(), web_contents, false); | 115 chrome::CloseWebContents(browser(), web_contents, false); |
115 EXPECT_EQ(active_index, browser()->tab_strip_model()->active_index()); | 116 EXPECT_EQ(active_index, browser()->tab_strip_model()->active_index()); |
116 EXPECT_EQ(1, browser()->tab_strip_model()->count()); | 117 EXPECT_EQ(1, browser()->tab_strip_model()->count()); |
117 EXPECT_FALSE(TranslateBubbleView::IsShowing()); | 118 EXPECT_FALSE(TranslateBubbleView::IsShowing()); |
118 | 119 |
119 // Close the last tab. | 120 // Close the last tab. |
120 chrome::CloseWebContents(browser(), | 121 chrome::CloseWebContents(browser(), |
121 browser()->tab_strip_model()->GetActiveWebContents(), | 122 browser()->tab_strip_model()->GetActiveWebContents(), |
122 false); | 123 false); |
123 } | 124 } |
OLD | NEW |