summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvarunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-20 23:48:37 +0000
committervarunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-20 23:48:37 +0000
commitf778d1f29be6a8f9702cceb9f9804cefbe833fba (patch)
tree6f52ca8399437eca63d4718dad5b43073a48695d
parentf51b26f9d53801651d9b9f314ef6ee85d0735ce1 (diff)
downloadchromium_src-f778d1f29be6a8f9702cceb9f9804cefbe833fba.zip
chromium_src-f778d1f29be6a8f9702cceb9f9804cefbe833fba.tar.gz
chromium_src-f778d1f29be6a8f9702cceb9f9804cefbe833fba.tar.bz2
Fix tab-strip related constants to accommodate the new images.
1. Shift tab contents up by 2px. 2. Shift close button left by 4px. 3. Increase the space between tabs (the width of the "V") by 3px. 4. Shift omnibox down 1px. BUG=137351 TEST=none Review URL: https://chromiumcodereview.appspot.com/10829389 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152429 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/views/tabs/tab.cc4
-rw-r--r--chrome/browser/ui/views/tabs/tab_strip.cc2
-rw-r--r--chrome/browser/ui/views/toolbar_view.cc2
3 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc
index f540b84..fcebe30 100644
--- a/chrome/browser/ui/views/tabs/tab.cc
+++ b/chrome/browser/ui/views/tabs/tab.cc
@@ -57,7 +57,7 @@ int top_padding() {
switch (ui::GetDisplayLayout()) {
case ui::LAYOUT_ASH:
case ui::LAYOUT_DESKTOP:
- value = 8;
+ value = 6;
break;
case ui::LAYOUT_TOUCH:
value = 12;
@@ -166,7 +166,7 @@ static const int kCloseButtonVertFuzz = 1;
static const int kCloseButtonVertFuzz = 0;
#endif
// Additional horizontal offset for close button relative to title text.
-static const int kCloseButtonHorzFuzz = 7;
+static const int kCloseButtonHorzFuzz = 3;
// When a non-mini-tab becomes a mini-tab the width of the tab animates. If
// the width of a mini-tab is >= kMiniTabRendererAsNormalTabWidth then the tab
diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc
index f2f084a..88af36e 100644
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -146,7 +146,7 @@ int tab_h_offset() {
switch (ui::GetDisplayLayout()) {
case ui::LAYOUT_ASH:
case ui::LAYOUT_DESKTOP:
- value = -29;
+ value = -26;
break;
case ui::LAYOUT_TOUCH:
value = -39;
diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc
index bbcbf64..ceb5546 100644
--- a/chrome/browser/ui/views/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar_view.cc
@@ -117,7 +117,7 @@ int location_bar_vert_spacing() {
switch (ui::GetDisplayLayout()) {
case ui::LAYOUT_ASH:
case ui::LAYOUT_DESKTOP:
- value = 4;
+ value = 5;
break;
case ui::LAYOUT_TOUCH:
value = 6;