diff options
| author | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-25 18:53:38 +0000 |
|---|---|---|
| committer | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-25 18:53:38 +0000 |
| commit | bd6dec7407bcacd66a3cb4adbc33fab42214a36d (patch) | |
| tree | 30c62fdee0606ef3d3c3f9370f0a936650a92a0a /chrome/browser/browser_main.cc | |
| parent | b05ce36f883bb46bf7bd78a235b1e979ed1add86 (diff) | |
| download | chromium_src-bd6dec7407bcacd66a3cb4adbc33fab42214a36d.zip chromium_src-bd6dec7407bcacd66a3cb4adbc33fab42214a36d.tar.gz chromium_src-bd6dec7407bcacd66a3cb4adbc33fab42214a36d.tar.bz2 | |
Translate Infobars for OS X.
Infobars.xib changes - Connect and fix class for close button since the translate infobar needs to know where it is to position the "Options" menu to it's left.
BUG=34466
TEST=Translate infobars should continue to workon Windows.
Review URL: http://codereview.chromium.org/594056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40034 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 63a3e86..002b0a3 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -824,12 +824,12 @@ int BrowserMain(const MainFunctionParams& parameters) { process_singleton.Create(); -#if defined(OS_WIN) +#if !defined(OS_LINUX) // Create the TranslateManager singleton. - // TODO(jcampan): enable on non Windows platforms when the info-bars are - // implemented. + // TODO(jcampan): enable on Linux when the info-bars are implemented. + // http://crbug.com/36714 Singleton<TranslateManager>::get(); -#endif +#endif // !OS_LINUX // Show the First Run UI if this is the first time Chrome has been run on // this computer, or we're being compelled to do so by a command line flag. |