summaryrefslogtreecommitdiffstats
path: root/chrome/browser/translate
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/translate')
-rw-r--r--chrome/browser/translate/translate_manager.cc29
-rw-r--r--chrome/browser/translate/translate_manager.h2
-rw-r--r--chrome/browser/translate/translate_manager_browsertest.cc18
-rw-r--r--chrome/browser/translate/translate_tab_helper.cc5
4 files changed, 29 insertions, 25 deletions
diff --git a/chrome/browser/translate/translate_manager.cc b/chrome/browser/translate/translate_manager.cc
index 5557378..0888ba5 100644
--- a/chrome/browser/translate/translate_manager.cc
+++ b/chrome/browser/translate/translate_manager.cc
@@ -26,6 +26,7 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/render_messages.h"
@@ -36,10 +37,10 @@
#include "content/browser/tab_contents/navigation_details.h"
#include "content/browser/tab_contents/navigation_entry.h"
#include "content/browser/tab_contents/tab_contents.h"
+#include "content/common/content_notification_types.h"
#include "content/common/notification_details.h"
#include "content/common/notification_service.h"
#include "content/common/notification_source.h"
-#include "content/common/notification_type.h"
#include "grit/browser_resources.h"
#include "net/base/escape.h"
#include "net/url_request/url_request_status.h"
@@ -247,11 +248,11 @@ bool TranslateManager::IsSupportedLanguage(const std::string& page_language) {
return supported_languages_.Pointer()->count(page_language) != 0;
}
-void TranslateManager::Observe(NotificationType type,
+void TranslateManager::Observe(int type,
const NotificationSource& source,
const NotificationDetails& details) {
- switch (type.value) {
- case NotificationType::NAV_ENTRY_COMMITTED: {
+ switch (type) {
+ case content::NOTIFICATION_NAV_ENTRY_COMMITTED: {
NavigationController* controller =
Source<NavigationController>(source).ptr();
content::LoadCommittedDetails* load_details =
@@ -294,7 +295,7 @@ void TranslateManager::Observe(NotificationType type,
helper->language_state().original_language()));
break;
}
- case NotificationType::TAB_LANGUAGE_DETERMINED: {
+ case chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED: {
TabContents* tab = Source<TabContents>(source).ptr();
// We may get this notifications multiple times. Make sure to translate
// only once.
@@ -314,7 +315,7 @@ void TranslateManager::Observe(NotificationType type,
}
break;
}
- case NotificationType::PAGE_TRANSLATED: {
+ case chrome::NOTIFICATION_PAGE_TRANSLATED: {
// Only add translate infobar if it doesn't exist; if it already exists,
// just update the state, the actual infobar would have received the same
// notification and update the visual display accordingly.
@@ -324,9 +325,10 @@ void TranslateManager::Observe(NotificationType type,
PageTranslated(tab, page_translated_details);
break;
}
- case NotificationType::PROFILE_DESTROYED: {
+ case chrome::NOTIFICATION_PROFILE_DESTROYED: {
Profile* profile = Source<Profile>(source).ptr();
- notification_registrar_.Remove(this, NotificationType::PROFILE_DESTROYED,
+ notification_registrar_.Remove(this,
+ chrome::NOTIFICATION_PROFILE_DESTROYED,
source);
size_t count = accept_languages_.erase(profile->GetPrefs());
// We should know about this profile since we are listening for
@@ -335,7 +337,7 @@ void TranslateManager::Observe(NotificationType type,
pref_change_registrar_.Remove(prefs::kAcceptLanguages, this);
break;
}
- case NotificationType::PREF_CHANGED: {
+ case chrome::NOTIFICATION_PREF_CHANGED: {
DCHECK(*Details<std::string>(details).ptr() == prefs::kAcceptLanguages);
PrefService* prefs = Source<PrefService>(source).ptr();
InitAcceptLanguages(prefs);
@@ -425,11 +427,12 @@ bool TranslateManager::IsShowingTranslateInfobar(TabContents* tab) {
TranslateManager::TranslateManager()
: ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)),
translate_script_expiration_delay_(kTranslateScriptExpirationDelayMS) {
- notification_registrar_.Add(this, NotificationType::NAV_ENTRY_COMMITTED,
+ notification_registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
NotificationService::AllSources());
- notification_registrar_.Add(this, NotificationType::TAB_LANGUAGE_DETERMINED,
+ notification_registrar_.Add(this,
+ chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED,
NotificationService::AllSources());
- notification_registrar_.Add(this, NotificationType::PAGE_TRANSLATED,
+ notification_registrar_.Add(this, chrome::NOTIFICATION_PAGE_TRANSLATED,
NotificationService::AllSources());
}
@@ -660,7 +663,7 @@ bool TranslateManager::IsAcceptLanguage(TabContents* tab,
InitAcceptLanguages(pref_service);
// Listen for this profile going away, in which case we would need to clear
// the accepted languages for the profile.
- notification_registrar_.Add(this, NotificationType::PROFILE_DESTROYED,
+ notification_registrar_.Add(this, chrome::NOTIFICATION_PROFILE_DESTROYED,
Source<Profile>(tab->profile()));
// Also start listening for changes in the accept languages.
pref_change_registrar_.Add(prefs::kAcceptLanguages, this);
diff --git a/chrome/browser/translate/translate_manager.h b/chrome/browser/translate/translate_manager.h
index e6a8f16..ab710f2 100644
--- a/chrome/browser/translate/translate_manager.h
+++ b/chrome/browser/translate/translate_manager.h
@@ -70,7 +70,7 @@ class TranslateManager : public NotificationObserver,
void ClearTranslateScript() { translate_script_.clear(); }
// NotificationObserver implementation:
- virtual void Observe(NotificationType type,
+ virtual void Observe(int type,
const NotificationSource& source,
const NotificationDetails& details);
diff --git a/chrome/browser/translate/translate_manager_browsertest.cc b/chrome/browser/translate/translate_manager_browsertest.cc
index 9f43086..5e9cf9e 100644
--- a/chrome/browser/translate/translate_manager_browsertest.cc
+++ b/chrome/browser/translate/translate_manager_browsertest.cc
@@ -19,6 +19,7 @@
#include "chrome/browser/translate/translate_prefs.h"
#include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h"
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/render_messages.h"
#include "chrome/test/testing_browser_process.h"
@@ -31,7 +32,6 @@
#include "content/common/notification_details.h"
#include "content/common/notification_observer_mock.h"
#include "content/common/notification_registrar.h"
-#include "content/common/notification_type.h"
#include "content/common/test_url_fetcher_factory.h"
#include "content/common/view_messages.h"
#include "grit/generated_resources.h"
@@ -138,10 +138,10 @@ class TranslateManagerTest : public TabContentsWrapperTestHarness,
return true;
}
- virtual void Observe(NotificationType type,
+ virtual void Observe(int type,
const NotificationSource& source,
const NotificationDetails& details) {
- DCHECK_EQ(NotificationType::TAB_CONTENTS_INFOBAR_REMOVED, type.value);
+ DCHECK_EQ(chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED, type);
removed_infobars_.insert(Details<InfoBarRemovedDetails>(details)->first);
}
@@ -164,7 +164,7 @@ class TranslateManagerTest : public TabContentsWrapperTestHarness,
TabContentsWrapperTestHarness::SetUp();
notification_registrar_.Add(this,
- NotificationType::TAB_CONTENTS_INFOBAR_REMOVED,
+ chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED,
Source<TabContentsWrapper>(contents_wrapper()));
}
@@ -172,7 +172,7 @@ class TranslateManagerTest : public TabContentsWrapperTestHarness,
process()->sink().ClearMessages();
notification_registrar_.Remove(this,
- NotificationType::TAB_CONTENTS_INFOBAR_REMOVED,
+ chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED,
Source<TabContentsWrapper>(contents_wrapper()));
TabContentsWrapperTestHarness::TearDown();
@@ -223,7 +223,7 @@ class TranslateManagerTest : public TabContentsWrapperTestHarness,
void SetPrefObserverExpectation(const char* path) {
EXPECT_CALL(
pref_observer_,
- Observe(NotificationType(NotificationType::PREF_CHANGED),
+ Observe(int(chrome::NOTIFICATION_PREF_CHANGED),
_,
Property(&Details<std::string>::ptr, Pointee(path))));
}
@@ -247,14 +247,14 @@ class TranslateManagerTest : public TabContentsWrapperTestHarness,
class NavEntryCommittedObserver : public NotificationObserver {
public:
explicit NavEntryCommittedObserver(TabContents* tab_contents) {
- registrar_.Add(this, NotificationType::NAV_ENTRY_COMMITTED,
+ registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
Source<NavigationController>(&tab_contents->controller()));
}
- virtual void Observe(NotificationType type,
+ virtual void Observe(int type,
const NotificationSource& source,
const NotificationDetails& details) {
- DCHECK(type == NotificationType::NAV_ENTRY_COMMITTED);
+ DCHECK(type == content::NOTIFICATION_NAV_ENTRY_COMMITTED);
details_ =
*(Details<content::LoadCommittedDetails>(details).ptr());
}
diff --git a/chrome/browser/translate/translate_tab_helper.cc b/chrome/browser/translate/translate_tab_helper.cc
index dd162b4..efd82c3 100644
--- a/chrome/browser/translate/translate_tab_helper.cc
+++ b/chrome/browser/translate/translate_tab_helper.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/translate/translate_tab_helper.h"
#include "chrome/browser/translate/page_translated_details.h"
+#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/render_messages.h"
#include "content/browser/tab_contents/tab_contents.h"
#include "content/common/notification_service.h"
@@ -42,7 +43,7 @@ void TranslateTabHelper::OnLanguageDetermined(const std::string& language,
std::string lang = language;
NotificationService::current()->Notify(
- NotificationType::TAB_LANGUAGE_DETERMINED,
+ chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED,
Source<TabContents>(tab_contents()),
Details<std::string>(&lang));
}
@@ -55,7 +56,7 @@ void TranslateTabHelper::OnPageTranslated(int32 page_id,
language_state_.set_translation_pending(false);
PageTranslatedDetails details(original_lang, translated_lang, error_type);
NotificationService::current()->Notify(
- NotificationType::PAGE_TRANSLATED,
+ chrome::NOTIFICATION_PAGE_TRANSLATED,
Source<TabContents>(tab_contents()),
Details<PageTranslatedDetails>(&details));
}
generated by cgit v1.1 at 2025-05-13 11:05:21 +0000