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 #include "chrome/browser/translate/translate_manager.h" | 5 #include "chrome/browser/translate/translate_manager.h" |
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/json/json_reader.h" | 10 #include "base/json/json_reader.h" |
11 #include "base/memory/singleton.h" | 11 #include "base/memory/singleton.h" |
12 #include "base/message_loop.h" | 12 #include "base/message_loop.h" |
13 #include "base/metrics/histogram.h" | 13 #include "base/metrics/histogram.h" |
14 #include "base/stringprintf.h" | |
15 #include "base/string_split.h" | 14 #include "base/string_split.h" |
16 #include "base/string_util.h" | 15 #include "base/string_util.h" |
| 16 #include "base/stringprintf.h" |
17 #include "base/values.h" | 17 #include "base/values.h" |
18 #include "chrome/browser/browser_process.h" | 18 #include "chrome/browser/browser_process.h" |
19 #include "chrome/browser/infobars/infobar_tab_helper.h" | 19 #include "chrome/browser/infobars/infobar_tab_helper.h" |
20 #include "chrome/browser/prefs/pref_service.h" | 20 #include "chrome/browser/prefs/pref_service.h" |
21 #include "chrome/browser/profiles/profile.h" | 21 #include "chrome/browser/profiles/profile.h" |
22 #include "chrome/browser/tab_contents/language_state.h" | 22 #include "chrome/browser/tab_contents/language_state.h" |
23 #include "chrome/browser/tab_contents/tab_util.h" | 23 #include "chrome/browser/tab_contents/tab_util.h" |
24 #include "chrome/browser/tabs/tab_strip_model.h" | 24 #include "chrome/browser/tabs/tab_strip_model.h" |
25 #include "chrome/browser/translate/page_translated_details.h" | 25 #include "chrome/browser/translate/page_translated_details.h" |
26 #include "chrome/browser/translate/translate_infobar_delegate.h" | 26 #include "chrome/browser/translate/translate_infobar_delegate.h" |
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
403 prefs::kAcceptLanguages); | 403 prefs::kAcceptLanguages); |
404 PrefService* prefs = content::Source<PrefService>(source).ptr(); | 404 PrefService* prefs = content::Source<PrefService>(source).ptr(); |
405 InitAcceptLanguages(prefs); | 405 InitAcceptLanguages(prefs); |
406 break; | 406 break; |
407 } | 407 } |
408 default: | 408 default: |
409 NOTREACHED(); | 409 NOTREACHED(); |
410 } | 410 } |
411 } | 411 } |
412 | 412 |
413 void TranslateManager::OnURLFetchComplete(const content::URLFetcher* source) { | 413 void TranslateManager::OnURLFetchComplete(const net::URLFetcher* source) { |
414 if (translate_script_request_pending_.get() != source && | 414 if (translate_script_request_pending_.get() != source && |
415 language_list_request_pending_.get() != source) { | 415 language_list_request_pending_.get() != source) { |
416 // Looks like crash on Mac is possibly caused with callback entering here | 416 // Looks like crash on Mac is possibly caused with callback entering here |
417 // with unknown fetcher when network is refreshed. | 417 // with unknown fetcher when network is refreshed. |
418 scoped_ptr<const content::URLFetcher> delete_ptr(source); | 418 scoped_ptr<const net::URLFetcher> delete_ptr(source); |
419 return; | 419 return; |
420 } | 420 } |
421 | 421 |
422 bool error = | 422 bool error = |
423 (source->GetStatus().status() != net::URLRequestStatus::SUCCESS || | 423 (source->GetStatus().status() != net::URLRequestStatus::SUCCESS || |
424 source->GetResponseCode() != 200); | 424 source->GetResponseCode() != 200); |
425 if (translate_script_request_pending_.get() == source) { | 425 if (translate_script_request_pending_.get() == source) { |
426 scoped_ptr<const content::URLFetcher> delete_ptr( | 426 scoped_ptr<const content::URLFetcher> delete_ptr( |
427 translate_script_request_pending_.release()); | 427 translate_script_request_pending_.release()); |
428 if (!error) { | 428 if (!error) { |
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
899 InfoBarTabHelper* infobar_helper = wrapper->infobar_tab_helper(); | 899 InfoBarTabHelper* infobar_helper = wrapper->infobar_tab_helper(); |
900 | 900 |
901 for (size_t i = 0; i < infobar_helper->infobar_count(); ++i) { | 901 for (size_t i = 0; i < infobar_helper->infobar_count(); ++i) { |
902 TranslateInfoBarDelegate* delegate = | 902 TranslateInfoBarDelegate* delegate = |
903 infobar_helper->GetInfoBarDelegateAt(i)->AsTranslateInfoBarDelegate(); | 903 infobar_helper->GetInfoBarDelegateAt(i)->AsTranslateInfoBarDelegate(); |
904 if (delegate) | 904 if (delegate) |
905 return delegate; | 905 return delegate; |
906 } | 906 } |
907 return NULL; | 907 return NULL; |
908 } | 908 } |
OLD | NEW |