Chromium Code Reviews| Index: chrome/browser/chrome_browser_main_posix.cc | 
| =================================================================== | 
| --- chrome/browser/chrome_browser_main_posix.cc (revision 128270) | 
| +++ chrome/browser/chrome_browser_main_posix.cc (working copy) | 
| @@ -26,7 +26,8 @@ | 
| #include <asm/page.h> // for PAGE_SIZE needed by PTHREAD_STACK_MIN | 
| #endif | 
| -#if defined(TOOLKIT_USES_GTK) && !defined(OS_CHROMEOS) | 
| 
 
Lei Zhang
2012/03/22 23:02:20
These are mutually exclusive.
 
 | 
| +#if defined(TOOLKIT_USES_GTK) | 
| +#include "chrome/browser/chrome_browser_main_extra_parts_gtk.h" | 
| #include "chrome/browser/printing/print_dialog_gtk.h" | 
| #endif | 
| @@ -267,8 +268,27 @@ | 
| action.sa_handler = SIGHUPHandler; | 
| CHECK(sigaction(SIGHUP, &action, NULL) == 0); | 
| -#if defined(TOOLKIT_USES_GTK) && !defined(OS_CHROMEOS) | 
| +#if defined(TOOLKIT_USES_GTK) | 
| printing::PrintingContextGtk::SetCreatePrintDialogFunction( | 
| &PrintDialogGtk::CreatePrintDialog); | 
| #endif | 
| } | 
| + | 
| +void ChromeBrowserMainPartsPosix::ShowMissingLocaleMessageBox() { | 
| +#if defined(OS_CHROMEOS) | 
| + NOTREACHED(); // Should not ever happen on ChromeOS. | 
| 
 
Lei Zhang
2012/03/22 23:02:20
stevenjb: in r109069, you put USE_AURA here, but I
 
stevenjb
2012/03/22 23:31:07
Aura should never call ShowMissingLocaleMessageBox
 
Lei Zhang
2012/03/22 23:37:10
Yes, this would be #error on Linux + Aura, which d
 
 | 
| +#elif defined(OS_ANDROID) | 
| + // TODO(port) Update this as needed. | 
| + // Probably should not ever happen on Android, but at the time of this | 
| + // writing, Android isn't even using ChromeBrowserMainPartsPosix yet. | 
| + NOTREACHED(); | 
| +#elif defined(OS_MACOSX) | 
| + // Not called on Mac because we load the locale files differently. | 
| + NOTREACHED(); | 
| +#elif defined(TOOLKIT_USES_GTK) | 
| + ChromeBrowserMainExtraPartsGtk::ShowMessageBox( | 
| + chrome_browser::kMissingLocaleDataMessage); | 
| +#else | 
| +#error "Need MessageBox implementation." | 
| +#endif | 
| +} |