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

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

Issue 10213011: Attempt 3 at a better touch tabstrip. There is still a bunch to do, (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove Tab::GetTouchModeMinimumSize Created 8 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 | « chrome/browser/ui/views/tabs/tab.h ('k') | chrome/browser/ui/views/tabs/tab_controller.h » ('j') | 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 4010b1b5116f4eb5c13437e9328155c449f834fd..f3d43ac87067fe2614d2a059899632d7485bd4c8 100644
--- a/chrome/browser/ui/views/tabs/tab.cc
+++ b/chrome/browser/ui/views/tabs/tab.cc
@@ -19,7 +19,6 @@
#include "ui/base/animation/multi_animation.h"
#include "ui/base/animation/throb_animation.h"
#include "ui/base/resource/resource_bundle.h"
-#include "ui/base/touch/touch_mode_support.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/favicon_size.h"
#include "ui/gfx/font.h"
@@ -72,7 +71,6 @@ static const int kCloseButtonHorzFuzz = 7;
#else
static const int kCloseButtonHorzFuzz = 5;
#endif
-static const int kTouchModeMinimumWidth = 160;
// 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
@@ -172,15 +170,11 @@ gfx::Size Tab::GetBasicMinimumUnselectedSize() {
}
gfx::Size Tab::GetMinimumUnselectedSize() {
- if (TouchModeSupport::IsTouchOptimized())
- return GetTouchModeMinimumSize();
return GetBasicMinimumUnselectedSize();
}
// static
gfx::Size Tab::GetMinimumSelectedSize() {
- if (TouchModeSupport::IsTouchOptimized())
- return GetTouchModeMinimumSize();
gfx::Size minimum_size = GetBasicMinimumUnselectedSize();
minimum_size.set_width(kLeftPadding + gfx::kFaviconSize + kRightPadding);
return minimum_size;
@@ -199,15 +193,6 @@ int Tab::GetMiniWidth() {
return browser_defaults::kMiniTabWidth;
}
-// static
-gfx::Size Tab::GetTouchModeMinimumSize() {
- InitTabResources();
- gfx::Size size;
- size.set_width(kTouchModeMinimumWidth);
- size.set_height(tab_active_.image_l->height());
- return size;
-}
-
////////////////////////////////////////////////////////////////////////////////
// Tab, protected:
« no previous file with comments | « chrome/browser/ui/views/tabs/tab.h ('k') | chrome/browser/ui/views/tabs/tab_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698