| Index: chrome/browser/ui/browser.cc
|
| diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
|
| index c64818fea0470d26ea0579bfc1860e6d664cbcef..8eb0372399437885100e881468cd6b6577a6a79b 100644
|
| --- a/chrome/browser/ui/browser.cc
|
| +++ b/chrome/browser/ui/browser.cc
|
| @@ -496,8 +496,6 @@ TabContents* Browser::OpenApplication(Profile* profile,
|
| const std::string& app_id,
|
| TabContents* existing_tab) {
|
| ExtensionsService* extensions_service = profile->GetExtensionsService();
|
| - if (!extensions_service->is_ready())
|
| - return NULL;
|
|
|
| // If the extension with |app_id| could't be found, most likely because it
|
| // was uninstalled.
|
| @@ -520,9 +518,11 @@ TabContents* Browser::OpenApplication(
|
|
|
| UMA_HISTOGRAM_ENUMERATION("Extensions.AppLaunchContainer", container, 100);
|
|
|
| - // The app is not yet open. Load it.
|
| switch (container) {
|
| case extension_misc::LAUNCH_WINDOW:
|
| + tab = Browser::OpenApplicationWindow(profile,
|
| + extension->GetFullLaunchURL());
|
| + break;
|
| case extension_misc::LAUNCH_PANEL:
|
| tab = Browser::OpenApplicationWindow(profile, extension, container,
|
| GURL());
|
| @@ -585,7 +585,7 @@ TabContents* Browser::OpenApplicationWindow(
|
| }
|
|
|
| // static
|
| -TabContents* Browser::OpenApplicationWindow(Profile* profile, GURL& url) {
|
| +TabContents* Browser::OpenApplicationWindow(Profile* profile, const GURL& url) {
|
| return OpenApplicationWindow(profile, NULL, extension_misc::LAUNCH_WINDOW,
|
| url);
|
| }
|
|
|