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

Side by Side Diff: chrome/browser/policy/policy_browsertest.cc

Issue 378253002: Fix translate namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing android build errors Created 6 years, 5 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
« no previous file with comments | « chrome/browser/extensions/api/tabs/tabs_api.cc ('k') | chrome/browser/prefs/browser_prefs.cc » ('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) 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 <algorithm> 5 #include <algorithm>
6 #include <string> 6 #include <string>
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 1971 matching lines...) Expand 10 before | Expand all | Expand 10 after
1982 content::WindowedNotificationObserver language_observer1( 1982 content::WindowedNotificationObserver language_observer1(
1983 chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED, 1983 chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED,
1984 content::NotificationService::AllSources()); 1984 content::NotificationService::AllSources());
1985 ui_test_utils::NavigateToURL(browser(), url); 1985 ui_test_utils::NavigateToURL(browser(), url);
1986 language_observer1.Wait(); 1986 language_observer1.Wait();
1987 1987
1988 // Verify the translation detected for this tab. 1988 // Verify the translation detected for this tab.
1989 ChromeTranslateClient* chrome_translate_client = 1989 ChromeTranslateClient* chrome_translate_client =
1990 ChromeTranslateClient::FromWebContents(contents); 1990 ChromeTranslateClient::FromWebContents(contents);
1991 ASSERT_TRUE(chrome_translate_client); 1991 ASSERT_TRUE(chrome_translate_client);
1992 LanguageState& language_state = chrome_translate_client->GetLanguageState(); 1992 translate::LanguageState& language_state =
1993 chrome_translate_client->GetLanguageState();
1993 EXPECT_EQ("fr", language_state.original_language()); 1994 EXPECT_EQ("fr", language_state.original_language());
1994 EXPECT_TRUE(language_state.page_needs_translation()); 1995 EXPECT_TRUE(language_state.page_needs_translation());
1995 EXPECT_FALSE(language_state.translation_pending()); 1996 EXPECT_FALSE(language_state.translation_pending());
1996 EXPECT_FALSE(language_state.translation_declined()); 1997 EXPECT_FALSE(language_state.translation_declined());
1997 EXPECT_FALSE(language_state.IsPageTranslated()); 1998 EXPECT_FALSE(language_state.IsPageTranslated());
1998 1999
1999 // Verify that the translate infobar showed up. 2000 // Verify that the translate infobar showed up.
2000 ASSERT_EQ(1u, infobar_service->infobar_count()); 2001 ASSERT_EQ(1u, infobar_service->infobar_count());
2001 infobars::InfoBar* infobar = infobar_service->infobar_at(0); 2002 infobars::InfoBar* infobar = infobar_service->infobar_at(0);
2002 TranslateInfoBarDelegate* translate_infobar_delegate = 2003 translate::TranslateInfoBarDelegate* translate_infobar_delegate =
2003 infobar->delegate()->AsTranslateInfoBarDelegate(); 2004 infobar->delegate()->AsTranslateInfoBarDelegate();
2004 ASSERT_TRUE(translate_infobar_delegate); 2005 ASSERT_TRUE(translate_infobar_delegate);
2005 EXPECT_EQ(translate::TRANSLATE_STEP_BEFORE_TRANSLATE, 2006 EXPECT_EQ(translate::TRANSLATE_STEP_BEFORE_TRANSLATE,
2006 translate_infobar_delegate->translate_step()); 2007 translate_infobar_delegate->translate_step());
2007 EXPECT_EQ("fr", translate_infobar_delegate->original_language_code()); 2008 EXPECT_EQ("fr", translate_infobar_delegate->original_language_code());
2008 2009
2009 // Now force disable translate. 2010 // Now force disable translate.
2010 infobar_service->RemoveInfoBar(infobar); 2011 infobar_service->RemoveInfoBar(infobar);
2011 EXPECT_EQ(0u, infobar_service->infobar_count()); 2012 EXPECT_EQ(0u, infobar_service->infobar_count());
2012 policies.Set(key::kTranslateEnabled, 2013 policies.Set(key::kTranslateEnabled,
(...skipping 1141 matching lines...) Expand 10 before | Expand all | Expand 10 after
3154 EXPECT_TRUE(content::ExecuteScriptAndExtractBool( 3155 EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
3155 browser2->tab_strip_model()->GetActiveWebContents(), 3156 browser2->tab_strip_model()->GetActiveWebContents(),
3156 "domAutomationController.send(window.showModalDialog !== undefined);", 3157 "domAutomationController.send(window.showModalDialog !== undefined);",
3157 &result)); 3158 &result));
3158 EXPECT_TRUE(result); 3159 EXPECT_TRUE(result);
3159 } 3160 }
3160 3161
3161 #endif // !defined(CHROME_OS) 3162 #endif // !defined(CHROME_OS)
3162 3163
3163 } // namespace policy 3164 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/tabs/tabs_api.cc ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698