diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-24 00:28:01 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-24 00:28:01 +0000 |
| commit | 967872d14a000b9eb925044825dd2d1185817124 (patch) | |
| tree | 6b8919b77052b7dee1e253324c0ffd6bebffaca4 /chrome/browser/tab_contents/tab_contents.cc | |
| parent | 045da4b8068f9d9c8d890f4e7c754b7b7ddf5ad5 (diff) | |
| download | chromium_src-967872d14a000b9eb925044825dd2d1185817124.zip chromium_src-967872d14a000b9eb925044825dd2d1185817124.tar.gz chromium_src-967872d14a000b9eb925044825dd2d1185817124.tar.bz2 | |
This adds a new kind of browser window: EXTENSION_APP. EXTENSION_APP windows have a bigger titlebar with a giant icon and title, and supports tabs.
Review URL: http://codereview.chromium.org/1730010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45520 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents/tab_contents.cc')
| -rw-r--r-- | chrome/browser/tab_contents/tab_contents.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc index 9ac90a9..1908aa3 100644 --- a/chrome/browser/tab_contents/tab_contents.cc +++ b/chrome/browser/tab_contents/tab_contents.cc @@ -2949,6 +2949,16 @@ void TabContents::Observe(NotificationType type, void TabContents::UpdateAppExtensionIcon(Extension* extension) { app_extension_icon_.reset(); + + // 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. + if (!delegate_ || + !delegate_->GetBrowser() || + delegate_->GetBrowser()->type() == Browser::TYPE_EXTENSION_APP) { + return; + } + if (extension) { app_extension_image_loader_.reset(new ImageLoadingTracker(this)); app_extension_image_loader_->LoadImage( |