diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-06 19:04:37 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-06 19:04:37 +0000 |
| commit | 4ead01008a6f7966580b7a7fce7dedc7badfaad3 (patch) | |
| tree | a84b3a3f317ae391b0368e4403effd911e5fccce | |
| parent | c7c92d5fa3bcd52fc7bec535eefb94381ea623c2 (diff) | |
| download | chromium_src-4ead01008a6f7966580b7a7fce7dedc7badfaad3.zip chromium_src-4ead01008a6f7966580b7a7fce7dedc7badfaad3.tar.gz chromium_src-4ead01008a6f7966580b7a7fce7dedc7badfaad3.tar.bz2 | |
Makes devtools window show caption on win-aura.
Code should only return false for ash, which isn't always the case on
win-aura.
BUG=262001
TEST=see bug
R=scottmg@chromium.org
Review URL: https://chromiumcodereview.appspot.com/22300006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215941 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/views/frame/browser_view.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index 3249868..c2f4dc9 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -1502,12 +1502,12 @@ views::View* BrowserView::GetInitiallyFocusedView() { } bool BrowserView::ShouldShowWindowTitle() const { -#if defined(USE_ASH) // For Ash only, app host windows do not show an icon, crbug.com/119411. // Child windows (i.e. popups) do show an icon. - if (browser_->is_app() && browser_->app_type() == Browser::APP_TYPE_HOST) + if (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH && + browser_->is_app() && browser_->app_type() == Browser::APP_TYPE_HOST) return false; -#endif + return browser_->SupportsWindowFeature(Browser::FEATURE_TITLEBAR); } |