diff options
| author | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 16:06:38 +0000 |
|---|---|---|
| committer | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 16:06:38 +0000 |
| commit | 790b3436863449038fcd251c69c214e36c71d0db (patch) | |
| tree | faa13b9a0aa3a12d1f4083465743954a503cb5c1 /chrome/browser/browser_main.cc | |
| parent | f2bc0cb52453bbca0c9b998994de8674f8a1e874 (diff) | |
| download | chromium_src-790b3436863449038fcd251c69c214e36c71d0db.zip chromium_src-790b3436863449038fcd251c69c214e36c71d0db.tar.gz chromium_src-790b3436863449038fcd251c69c214e36c71d0db.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/2867017
Review URL: http://codereview.chromium.org/2836023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50848 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, 0 insertions, 8 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index ca77eb6..a1324fa 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -56,11 +56,7 @@ #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) && !defined(OS_MACOSX) -#include "chrome/browser/translate/translate_manager.h" -#else #include "chrome/browser/translate/translate_manager2.h" -#endif #include "chrome/common/child_process.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" @@ -1211,11 +1207,7 @@ int BrowserMain(const MainFunctionParams& parameters) { return ResultCodes::MACHINE_LEVEL_INSTALL_EXISTS; // Create the TranslateManager singleton. -#if defined(OS_WIN) || defined(OS_MACOSX) Singleton<TranslateManager2>::get(); -#else - Singleton<TranslateManager>::get(); -#endif #if defined(OS_MACOSX) if (!parsed_command_line.HasSwitch(switches::kNoFirstRun)) { |