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

Side by Side Diff: chrome/browser/ui/views/tabs/tab.cc

Issue 136093007: Widget::ShouldUseNativeFrame is now meaningful on Linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 6 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/tabs/tab.h" 5 #include "chrome/browser/ui/views/tabs/tab.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/alias.h" 10 #include "base/debug/alias.h"
(...skipping 1590 matching lines...) Expand 10 before | Expand all | Expand 10 after
1601 return chrome::ShouldTabShowMediaIndicator( 1601 return chrome::ShouldTabShowMediaIndicator(
1602 IconCapacity(), data().mini, IsActive(), data().show_icon, 1602 IconCapacity(), data().mini, IsActive(), data().show_icon,
1603 animating_media_state_); 1603 animating_media_state_);
1604 } 1604 }
1605 1605
1606 bool Tab::ShouldShowCloseBox() const { 1606 bool Tab::ShouldShowCloseBox() const {
1607 return chrome::ShouldTabShowCloseButton( 1607 return chrome::ShouldTabShowCloseButton(
1608 IconCapacity(), data().mini, IsActive()); 1608 IconCapacity(), data().mini, IsActive());
1609 } 1609 }
1610 1610
1611 bool Tab::UsingWindowsGlass(const views::Widget* widget) const {
1612 #if defined(OS_WIN)
1613 return widget && widget->GetTopLevelWidget()->ShouldUseNativeFrame();
1614 #endif
1615 return false;
1616 }
1617
1611 double Tab::GetThrobValue() { 1618 double Tab::GetThrobValue() {
1612 bool is_selected = IsSelected(); 1619 bool is_selected = IsSelected();
1613 double min = is_selected ? kSelectedTabOpacity : 0; 1620 double min = is_selected ? kSelectedTabOpacity : 0;
1614 double scale = is_selected ? kSelectedTabThrobScale : 1; 1621 double scale = is_selected ? kSelectedTabThrobScale : 1;
1615 1622
1616 if (!data().mini) { 1623 if (!data().mini) {
1617 if (tab_animation_.get() && tab_animation_->is_animating()) 1624 if (tab_animation_.get() && tab_animation_->is_animating())
1618 return tab_animation_->GetCurrentValue() * kHoverOpacity * scale + min; 1625 return tab_animation_->GetCurrentValue() * kHoverOpacity * scale + min;
1619 } 1626 }
1620 1627
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
1679 const int kBarPadding = 1; 1686 const int kBarPadding = 1;
1680 int main_bar_left = tab_active_.l_width - kBarPadding; 1687 int main_bar_left = tab_active_.l_width - kBarPadding;
1681 int main_bar_right = width() - tab_active_.r_width + kBarPadding; 1688 int main_bar_right = width() - tab_active_.r_width + kBarPadding;
1682 return gfx::Rect( 1689 return gfx::Rect(
1683 main_bar_left, 0, main_bar_right - main_bar_left, kImmersiveBarHeight); 1690 main_bar_left, 0, main_bar_right - main_bar_left, kImmersiveBarHeight);
1684 } 1691 }
1685 1692
1686 void Tab::GetTabIdAndFrameId(views::Widget* widget, 1693 void Tab::GetTabIdAndFrameId(views::Widget* widget,
1687 int* tab_id, 1694 int* tab_id,
1688 int* frame_id) const { 1695 int* frame_id) const {
1689 if (widget && widget->GetTopLevelWidget()->ShouldUseNativeFrame()) { 1696 if (UsingWindowsGlass(widget)) {
1690 *tab_id = IDR_THEME_TAB_BACKGROUND_V; 1697 *tab_id = IDR_THEME_TAB_BACKGROUND_V;
1691 *frame_id = 0; 1698 *frame_id = 0;
1692 } else if (data().incognito) { 1699 } else if (data().incognito) {
1693 *tab_id = IDR_THEME_TAB_BACKGROUND_INCOGNITO; 1700 *tab_id = IDR_THEME_TAB_BACKGROUND_INCOGNITO;
1694 *frame_id = IDR_THEME_FRAME_INCOGNITO; 1701 *frame_id = IDR_THEME_FRAME_INCOGNITO;
1695 #if defined(OS_WIN) 1702 #if defined(OS_WIN)
1696 } else if (win8::IsSingleWindowMetroMode()) { 1703 } else if (win8::IsSingleWindowMetroMode()) {
1697 *tab_id = IDR_THEME_TAB_BACKGROUND_V; 1704 *tab_id = IDR_THEME_TAB_BACKGROUND_V;
1698 *frame_id = 0; 1705 *frame_id = 0;
1699 #endif 1706 #endif
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
1765 const gfx::ImageSkia& image) { 1772 const gfx::ImageSkia& image) {
1766 DCHECK_NE(scale_factor, ui::SCALE_FACTOR_NONE); 1773 DCHECK_NE(scale_factor, ui::SCALE_FACTOR_NONE);
1767 ImageCacheEntry entry; 1774 ImageCacheEntry entry;
1768 entry.resource_id = resource_id; 1775 entry.resource_id = resource_id;
1769 entry.scale_factor = scale_factor; 1776 entry.scale_factor = scale_factor;
1770 entry.image = image; 1777 entry.image = image;
1771 image_cache_->push_front(entry); 1778 image_cache_->push_front(entry);
1772 if (image_cache_->size() > kMaxImageCacheSize) 1779 if (image_cache_->size() > kMaxImageCacheSize)
1773 image_cache_->pop_back(); 1780 image_cache_->pop_back();
1774 } 1781 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698