summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_contents
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-29 17:14:32 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-29 17:14:32 +0000
commitd49b7939865d7b7d0c15f4525befa7935eac48fe (patch)
treeeeac50c5687c50f380485345b0f6c83c6ddefd28 /chrome/browser/tab_contents
parent8d0b59d305d73765890b2154bfed916f271ec191 (diff)
downloadchromium_src-d49b7939865d7b7d0c15f4525befa7935eac48fe.zip
chromium_src-d49b7939865d7b7d0c15f4525befa7935eac48fe.tar.gz
chromium_src-d49b7939865d7b7d0c15f4525befa7935eac48fe.tar.bz2
Revert "implement error state for translate infobar"
Due to broken build (compile). TBR=kuan BUG=38548 Review URL: http://codereview.chromium.org/1567001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42955 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
-rw-r--r--chrome/browser/tab_contents/tab_contents.cc13
-rw-r--r--chrome/browser/tab_contents/tab_contents.h4
2 files changed, 7 insertions, 10 deletions
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index 7035226..f739a9e 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -53,8 +53,6 @@
#include "chrome/browser/renderer_host/translation_service.h"
#include "chrome/browser/renderer_host/web_cache_manager.h"
#include "chrome/browser/renderer_preferences_util.h"
-#include "chrome/browser/search_engines/template_url_fetcher.h"
-#include "chrome/browser/search_engines/template_url_model.h"
#include "chrome/browser/sessions/session_types.h"
#include "chrome/browser/tab_contents/infobar_delegate.h"
#include "chrome/browser/tab_contents/interstitial_page.h"
@@ -64,7 +62,8 @@
#include "chrome/browser/tab_contents/tab_contents_view.h"
#include "chrome/browser/tab_contents/thumbnail_generator.h"
#include "chrome/browser/thumbnail_store.h"
-#include "chrome/browser/translate/page_translated_details.h"
+#include "chrome/browser/search_engines/template_url_fetcher.h"
+#include "chrome/browser/search_engines/template_url_model.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_action.h"
@@ -1920,15 +1919,15 @@ void TabContents::OnPageContents(const GURL& url,
void TabContents::OnPageTranslated(int32 page_id,
const std::string& original_lang,
- const std::string& translated_lang,
- TranslateErrors::Type error_type) {
+ const std::string& translated_lang) {
language_state_.set_current_language(translated_lang);
language_state_.set_translation_pending(false);
- PageTranslatedDetails details(original_lang, translated_lang, error_type);
+ std::pair<std::string, std::string> lang_pair =
+ std::make_pair(original_lang, translated_lang);
NotificationService::current()->Notify(
NotificationType::PAGE_TRANSLATED,
Source<TabContents>(this),
- Details<PageTranslatedDetails>(&details));
+ Details<std::pair<std::string, std::string> >(&lang_pair));
}
void TabContents::DidStartProvisionalLoadForFrame(
diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h
index c64fe16..5ea18a6 100644
--- a/chrome/browser/tab_contents/tab_contents.h
+++ b/chrome/browser/tab_contents/tab_contents.h
@@ -41,7 +41,6 @@
#include "chrome/common/notification_registrar.h"
#include "chrome/common/property_bag.h"
#include "chrome/common/renderer_preferences.h"
-#include "chrome/common/translate_errors.h"
#include "gfx/native_widget_types.h"
#include "gfx/rect.h"
#include "net/base/load_states.h"
@@ -827,8 +826,7 @@ class TabContents : public PageNavigator,
const std::string& language);
virtual void OnPageTranslated(int32 page_id,
const std::string& original_lang,
- const std::string& translated_lang,
- TranslateErrors::Type error_type);
+ const std::string& translated_lang);
// RenderViewHostDelegate::Resource implementation.
virtual void DidStartProvisionalLoadForFrame(RenderViewHost* render_view_host,