Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(341)

Unified Diff: chrome/browser/browser.cc

Issue 3149029: Remove TYPE_EXTENSION_APP. Experiment failed. (Closed) Base URL: git://codf21.jail/chromium.git
Patch Set: restored change to tab_strip_model.h Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/browser.h ('k') | chrome/browser/chromeos/wm_overview_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
}
///////////////////////////////////////////////////////////////////////////////
« no previous file with comments | « chrome/browser/browser.h ('k') | chrome/browser/chromeos/wm_overview_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698