Chromium Code Reviews| Index: chrome/browser/extensions/extension_prefs.cc |
| diff --git a/chrome/browser/extensions/extension_prefs.cc b/chrome/browser/extensions/extension_prefs.cc |
| index 3c789b094fa88fcce2fcb8526a45694e5e428fb3..26e601f08e7cd5a3e78b8dd903bd179206509447 100644 |
| --- a/chrome/browser/extensions/extension_prefs.cc |
| +++ b/chrome/browser/extensions/extension_prefs.cc |
| @@ -452,12 +452,22 @@ void ExtensionPrefs::SetAllowFileAccess(const std::string& extension_id, |
| ExtensionPrefs::LaunchType ExtensionPrefs::GetLaunchType( |
| const std::string& extension_id) { |
| int value; |
| - if (ReadExtensionPrefInteger(extension_id, kPrefLaunchType, &value) && ( |
| - value == LAUNCH_PINNED || |
| + if (ReadExtensionPrefInteger(extension_id, kPrefLaunchType, &value) && |
| + (value == LAUNCH_PINNED || |
| value == LAUNCH_REGULAR || |
| - value == LAUNCH_FULLSCREEN)) { |
| + value == LAUNCH_FULLSCREEN || |
| + value == LAUNCH_WINDOW)) { |
| + |
| +#if defined(OS_MACOSX) |
| + // App windows are not yet supported on mac. Pref sync could make |
| + // the launch type LAUNCH_WINDOW, even if there is no UI to set it |
| + // on mac. |
| + if (value == LAUNCH_WINDOW) |
| + return LAUNCH_REGULAR; |
|
Aaron Boodman
2010/11/18 07:49:03
Nice catch.
|
| +#endif |
| return static_cast<LaunchType>(value); |
| } |
| + |
| return LAUNCH_REGULAR; |
| } |