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

Side by Side Diff: chrome/browser/ui/browser_browsertest.cc

Issue 133273029: Move LanguageState to the translate component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix more compile issues Created 6 years, 11 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
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 <string> 5 #include <string>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 1260 matching lines...) Expand 10 before | Expand all | Expand 10 after
1271 WebContents* current_web_contents = 1271 WebContents* current_web_contents =
1272 browser()->tab_strip_model()->GetActiveWebContents(); 1272 browser()->tab_strip_model()->GetActiveWebContents();
1273 TranslateTabHelper* translate_tab_helper = 1273 TranslateTabHelper* translate_tab_helper =
1274 TranslateTabHelper::FromWebContents(current_web_contents); 1274 TranslateTabHelper::FromWebContents(current_web_contents);
1275 content::Source<WebContents> source(current_web_contents); 1275 content::Source<WebContents> source(current_web_contents);
1276 1276
1277 ui_test_utils::WindowedNotificationObserverWithDetails< 1277 ui_test_utils::WindowedNotificationObserverWithDetails<
1278 LanguageDetectionDetails> 1278 LanguageDetectionDetails>
1279 en_language_detected_signal(chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED, 1279 en_language_detected_signal(chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED,
1280 source); 1280 source);
1281 EXPECT_EQ("", translate_tab_helper->language_state().original_language()); 1281 EXPECT_EQ("", translate_tab_helper->GetLanguageState().original_language());
1282 en_language_detected_signal.Wait(); 1282 en_language_detected_signal.Wait();
1283 EXPECT_TRUE(en_language_detected_signal.GetDetailsFor( 1283 EXPECT_TRUE(en_language_detected_signal.GetDetailsFor(
1284 source.map_key(), &details)); 1284 source.map_key(), &details));
1285 EXPECT_EQ("en", details.adopted_language); 1285 EXPECT_EQ("en", details.adopted_language);
1286 EXPECT_EQ("en", translate_tab_helper->language_state().original_language()); 1286 EXPECT_EQ("en", translate_tab_helper->GetLanguageState().original_language());
1287 1287
1288 // Now navigate to a page in French. 1288 // Now navigate to a page in French.
1289 ui_test_utils::WindowedNotificationObserverWithDetails< 1289 ui_test_utils::WindowedNotificationObserverWithDetails<
1290 LanguageDetectionDetails> 1290 LanguageDetectionDetails>
1291 fr_language_detected_signal(chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED, 1291 fr_language_detected_signal(chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED,
1292 source); 1292 source);
1293 ui_test_utils::NavigateToURL( 1293 ui_test_utils::NavigateToURL(
1294 browser(), GURL(test_server()->GetURL("files/french_page.html"))); 1294 browser(), GURL(test_server()->GetURL("files/french_page.html")));
1295 fr_language_detected_signal.Wait(); 1295 fr_language_detected_signal.Wait();
1296 details.adopted_language.clear(); 1296 details.adopted_language.clear();
1297 EXPECT_TRUE(fr_language_detected_signal.GetDetailsFor( 1297 EXPECT_TRUE(fr_language_detected_signal.GetDetailsFor(
1298 source.map_key(), &details)); 1298 source.map_key(), &details));
1299 EXPECT_EQ("fr", details.adopted_language); 1299 EXPECT_EQ("fr", details.adopted_language);
1300 EXPECT_EQ("fr", translate_tab_helper->language_state().original_language()); 1300 EXPECT_EQ("fr", translate_tab_helper->GetLanguageState().original_language());
1301 } 1301 }
1302 1302
1303 // Chromeos defaults to restoring the last session, so this test isn't 1303 // Chromeos defaults to restoring the last session, so this test isn't
1304 // applicable. 1304 // applicable.
1305 #if !defined(OS_CHROMEOS) 1305 #if !defined(OS_CHROMEOS)
1306 #if defined(OS_MACOSX) 1306 #if defined(OS_MACOSX)
1307 // Crashy, http://crbug.com/38522 1307 // Crashy, http://crbug.com/38522
1308 #define RestorePinnedTabs DISABLED_RestorePinnedTabs 1308 #define RestorePinnedTabs DISABLED_RestorePinnedTabs
1309 #endif 1309 #endif
1310 // Makes sure pinned tabs are restored correctly on start. 1310 // Makes sure pinned tabs are restored correctly on start.
(...skipping 1245 matching lines...) Expand 10 before | Expand all | Expand 10 after
2556 exp_commit_size.Enlarge(wcv_resize_insets.width(), 2556 exp_commit_size.Enlarge(wcv_resize_insets.width(),
2557 wcv_resize_insets.height() + height_inset); 2557 wcv_resize_insets.height() + height_inset);
2558 EXPECT_EQ(exp_commit_size, rwhv_commit_size2); 2558 EXPECT_EQ(exp_commit_size, rwhv_commit_size2);
2559 EXPECT_EQ(exp_commit_size, wcv_commit_size2); 2559 EXPECT_EQ(exp_commit_size, wcv_commit_size2);
2560 // Sizes of RenderWidgetHostView and WebContentsView before and after 2560 // Sizes of RenderWidgetHostView and WebContentsView before and after
2561 // WebContentsDelegate::DidNavigateMainFramePostCommit should be the same. 2561 // WebContentsDelegate::DidNavigateMainFramePostCommit should be the same.
2562 EXPECT_EQ(rwhv_commit_size2, 2562 EXPECT_EQ(rwhv_commit_size2,
2563 web_contents->GetRenderWidgetHostView()->GetViewBounds().size()); 2563 web_contents->GetRenderWidgetHostView()->GetViewBounds().size());
2564 EXPECT_EQ(wcv_commit_size2, web_contents->GetView()->GetContainerSize()); 2564 EXPECT_EQ(wcv_commit_size2, web_contents->GetView()->GetContainerSize());
2565 } 2565 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698