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

Unified Diff: chrome/browser/ui/views/tabs/tab.cc

Issue 259953002: Fix tabs.cc static initializer issue. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/tabs/tab.cc
diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc
index ed2b4720bdeb93d4ac0b6c2594234791bf5f8656..9a529f08c15c9217c784f4ecd3718d6352d9bd72 100644
--- a/chrome/browser/ui/views/tabs/tab.cc
+++ b/chrome/browser/ui/views/tabs/tab.cc
@@ -63,9 +63,6 @@ const int kBottomPadding = 5;
// Height of the shadow at the top of the tab image assets.
const int kDropShadowHeight = 4;
-// Size of icon used for throbber and favicon next to tab title.
-const int kTabIconSize = gfx::kFaviconSize;
-
// How long the pulse throb takes.
const int kPulseDurationMs = 200;
@@ -688,6 +685,7 @@ void Tab::Layout() {
// The height of the content of the Tab is the largest of the favicon,
// the title text and the close button graphic.
+ const int kTabIconSize = gfx::kFaviconSize;
int content_height = std::max(kTabIconSize, font_height_);
close_button_->SetBorder(views::Border::NullBorder());
gfx::Size close_button_size(close_button_->GetPreferredSize());
@@ -1470,7 +1468,7 @@ int Tab::IconCapacity() const {
return 0;
const int available_width =
std::max(0, width() - kLeftPadding - kRightPadding);
- const int width_per_icon = kTabIconSize;
+ const int width_per_icon = gfx::kFaviconSize;
const int kPaddingBetweenIcons = 2;
if (available_width >= width_per_icon &&
available_width < (width_per_icon + kPaddingBetweenIcons)) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698