diff options
| author | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-17 22:00:14 +0000 |
|---|---|---|
| committer | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-17 22:00:14 +0000 |
| commit | 8d632f3c42177a3e68d6f301ed1821e417ebc14d (patch) | |
| tree | 7adbc375f26bae044b3cc8435f3f5fa9c55342ce /chrome/browser/browser_main.cc | |
| parent | 3f73cd3125ed49700efa501a330eebc322421433 (diff) | |
| download | chromium_src-8d632f3c42177a3e68d6f301ed1821e417ebc14d.zip chromium_src-8d632f3c42177a3e68d6f301ed1821e417ebc14d.tar.gz chromium_src-8d632f3c42177a3e68d6f301ed1821e417ebc14d.tar.bz2 | |
Porting the infobars on Linux to the new TranslateInfobarDelegate2.
Each translate infobar is now its own class and most of the logic is in the delegate.
BUG=40828
TEST=Thoroughly test the translate feature on Linux.
Review URL: http://codereview.chromium.org/2836006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50148 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 9bec9f2..40a6d46 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -56,10 +56,10 @@ #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/search_engines/template_url_prepopulate_data.h" #include "chrome/browser/shell_integration.h" -#if !defined(OS_WIN) -#include "chrome/browser/translate/translate_manager.h" -#else +#if defined(OS_WIN) || defined(OS_LINUX) #include "chrome/browser/translate/translate_manager2.h" +#else +#include "chrome/browser/translate/translate_manager.h" #endif #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" @@ -1175,7 +1175,7 @@ int BrowserMain(const MainFunctionParams& parameters) { return ResultCodes::MACHINE_LEVEL_INSTALL_EXISTS; // Create the TranslateManager singleton. -#if defined(OS_WIN) +#if defined(OS_WIN) || defined(OS_LINUX) Singleton<TranslateManager2>::get(); #else Singleton<TranslateManager>::get(); |