| OLD | NEW |
| 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 | 5 |
| 6 #include <algorithm> | 6 #include <algorithm> |
| 7 #include <set> | 7 #include <set> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/json/json_writer.h" | 10 #include "base/json/json_writer.h" |
| 11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
| 12 #include "base/prefs/pref_change_registrar.h" | 12 #include "base/prefs/pref_change_registrar.h" |
| 13 #include "base/prefs/pref_service.h" | 13 #include "base/prefs/pref_service.h" |
| 14 #include "base/stringprintf.h" | 14 #include "base/stringprintf.h" |
| 15 #include "base/utf_string_conversions.h" | 15 #include "base/utf_string_conversions.h" |
| 16 #include "base/values.h" | 16 #include "base/values.h" |
| 17 #include "chrome/app/chrome_command_ids.h" | 17 #include "chrome/app/chrome_command_ids.h" |
| 18 #include "chrome/browser/extensions/test_extension_system.h" | 18 #include "chrome/browser/extensions/test_extension_system.h" |
| 19 #include "chrome/browser/infobars/infobar.h" | 19 #include "chrome/browser/infobars/infobar.h" |
| 20 #include "chrome/browser/infobars/infobar_service.h" | 20 #include "chrome/browser/infobars/infobar_service.h" |
| 21 #include "chrome/browser/prefs/session_startup_pref.h" | 21 #include "chrome/browser/prefs/session_startup_pref.h" |
| 22 #include "chrome/browser/tab_contents/render_view_context_menu.h" | 22 #include "chrome/browser/tab_contents/render_view_context_menu.h" |
| 23 #include "chrome/browser/translate/translate_infobar_delegate.h" | 23 #include "chrome/browser/translate/translate_infobar_delegate.h" |
| 24 #include "chrome/browser/translate/translate_language_list.h" |
| 24 #include "chrome/browser/translate/translate_manager.h" | 25 #include "chrome/browser/translate/translate_manager.h" |
| 25 #include "chrome/browser/translate/translate_prefs.h" | 26 #include "chrome/browser/translate/translate_prefs.h" |
| 26 #include "chrome/browser/translate/translate_tab_helper.h" | 27 #include "chrome/browser/translate/translate_tab_helper.h" |
| 27 #include "chrome/browser/ui/browser.h" | 28 #include "chrome/browser/ui/browser.h" |
| 28 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 29 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 29 #include "chrome/common/chrome_notification_types.h" | 30 #include "chrome/common/chrome_notification_types.h" |
| 30 #include "chrome/common/language_detection_details.h" | 31 #include "chrome/common/language_detection_details.h" |
| 31 #include "chrome/common/pref_names.h" | 32 #include "chrome/common/pref_names.h" |
| 32 #include "chrome/common/render_messages.h" | 33 #include "chrome/common/render_messages.h" |
| 33 #include "chrome/common/url_constants.h" | 34 #include "chrome/common/url_constants.h" |
| (...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 275 void SimulateSupportedLanguagesURLFetch( | 276 void SimulateSupportedLanguagesURLFetch( |
| 276 bool success, const std::vector<std::string>& languages) { | 277 bool success, const std::vector<std::string>& languages) { |
| 277 net::TestURLFetcher* fetcher = url_fetcher_factory_.GetFetcherByID(1); | 278 net::TestURLFetcher* fetcher = url_fetcher_factory_.GetFetcherByID(1); |
| 278 ASSERT_TRUE(fetcher); | 279 ASSERT_TRUE(fetcher); |
| 279 net::URLRequestStatus status; | 280 net::URLRequestStatus status; |
| 280 status.set_status(success ? net::URLRequestStatus::SUCCESS : | 281 status.set_status(success ? net::URLRequestStatus::SUCCESS : |
| 281 net::URLRequestStatus::FAILED); | 282 net::URLRequestStatus::FAILED); |
| 282 | 283 |
| 283 std::string data; | 284 std::string data; |
| 284 if (success) { | 285 if (success) { |
| 285 data = base::StringPrintf("%s{\"sl\": {\"bla\": \"bla\"}, \"%s\": {", | 286 data = base::StringPrintf( |
| 286 TranslateManager::kLanguageListCallbackName, | 287 "%s{\"sl\": {\"bla\": \"bla\"}, \"%s\": {", |
| 287 TranslateManager::kTargetLanguagesKey); | 288 TranslateLanguageList::kLanguageListCallbackName, |
| 289 TranslateLanguageList::kTargetLanguagesKey); |
| 288 const char* comma = ""; | 290 const char* comma = ""; |
| 289 for (size_t i = 0; i < languages.size(); ++i) { | 291 for (size_t i = 0; i < languages.size(); ++i) { |
| 290 data += base::StringPrintf( | 292 data += base::StringPrintf( |
| 291 "%s\"%s\": \"UnusedFullName\"", comma, languages[i].c_str()); | 293 "%s\"%s\": \"UnusedFullName\"", comma, languages[i].c_str()); |
| 292 if (i == 0) | 294 if (i == 0) |
| 293 comma = ","; | 295 comma = ","; |
| 294 } | 296 } |
| 295 data += "}})"; | 297 data += "}})"; |
| 296 } | 298 } |
| 297 fetcher->set_url(fetcher->GetOriginalURL()); | 299 fetcher->set_url(fetcher->GetOriginalURL()); |
| (...skipping 1229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1527 WebContents* current_web_contents = | 1529 WebContents* current_web_contents = |
| 1528 browser()->tab_strip_model()->GetActiveWebContents(); | 1530 browser()->tab_strip_model()->GetActiveWebContents(); |
| 1529 content::Source<WebContents> source(current_web_contents); | 1531 content::Source<WebContents> source(current_web_contents); |
| 1530 | 1532 |
| 1531 ui_test_utils::WindowedNotificationObserverWithDetails< | 1533 ui_test_utils::WindowedNotificationObserverWithDetails< |
| 1532 LanguageDetectionDetails> | 1534 LanguageDetectionDetails> |
| 1533 fr_language_detected_signal(chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED, | 1535 fr_language_detected_signal(chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED, |
| 1534 source); | 1536 source); |
| 1535 fr_language_detected_signal.Wait(); | 1537 fr_language_detected_signal.Wait(); |
| 1536 } | 1538 } |
| OLD | NEW |