| Index: chrome/browser/browser.cc
|
| diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
|
| index f372e0a3182e4584389af9da95b7868e587f2623..3b8ac470fd08142e986c056a2e97091b775bcf6b 100644
|
| --- a/chrome/browser/browser.cc
|
| +++ b/chrome/browser/browser.cc
|
| @@ -171,8 +171,7 @@ bool BrowserHostsExtensionApp(Browser* browser,
|
| if (browser->profile() != profile)
|
| return false;
|
|
|
| - if (browser->type() != Browser::TYPE_EXTENSION_APP &&
|
| - browser->type() != Browser::TYPE_APP_PANEL)
|
| + if (browser->type() != Browser::TYPE_APP_PANEL)
|
| return false;
|
|
|
| if (browser->extension_app() != extension_app)
|
| @@ -326,8 +325,6 @@ Browser* Browser::CreateForApp(const std::string& app_name,
|
|
|
| if (is_panel)
|
| type = TYPE_APP_PANEL;
|
| - else if (extension)
|
| - type = TYPE_EXTENSION_APP;
|
|
|
| Browser* browser = new Browser(type, profile);
|
| browser->app_name_ = app_name;
|
| @@ -1176,16 +1173,16 @@ bool Browser::SupportsWindowFeatureImpl(WindowFeature feature,
|
| }
|
|
|
| if (!hide_ui_for_fullscreen) {
|
| - if (type() != TYPE_NORMAL && type() != TYPE_EXTENSION_APP)
|
| + if (type() != TYPE_NORMAL)
|
| features |= FEATURE_TITLEBAR;
|
|
|
| - if (type() == TYPE_NORMAL || type() == TYPE_EXTENSION_APP)
|
| + if (type() == TYPE_NORMAL)
|
| features |= FEATURE_TABSTRIP;
|
|
|
| - if (type() == TYPE_NORMAL || type() == TYPE_EXTENSION_APP)
|
| + if (type() == TYPE_NORMAL)
|
| features |= FEATURE_TOOLBAR;
|
|
|
| - if (type() != TYPE_EXTENSION_APP && (type() & Browser::TYPE_APP) == 0)
|
| + if ((type() & Browser::TYPE_APP) == 0)
|
| features |= FEATURE_LOCATIONBAR;
|
| }
|
| return !!(features & feature);
|
| @@ -2413,10 +2410,7 @@ void Browser::ToggleUseVerticalTabs() {
|
| }
|
|
|
| bool Browser::LargeIconsPermitted() const {
|
| - // We don't show the big icons in tabs for TYPE_EXTENSION_APP windows because
|
| - // for those windows, we already have a big icon in the top-left outside any
|
| - // tab. Having big tab icons too looks kinda redonk.
|
| - return TYPE_EXTENSION_APP != type();
|
| + return false;
|
| }
|
|
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|