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

Side by Side Diff: chrome/browser/ui/views/tabs/tab_strip.h

Issue 8632001: Removed TOUCH_UI (mostly constants) from chrome/browser/ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 9 years, 1 month 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
« no previous file with comments | « chrome/browser/ui/views/tabs/tab.cc ('k') | chrome/browser/ui/views/tabs/tab_strip.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #ifndef CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_H_
6 #define CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_H_ 6 #define CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/timer.h" 10 #include "base/timer.h"
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 int available_width_for_tabs_; 251 int available_width_for_tabs_;
252 252
253 // True if PrepareForCloseAt has been invoked. When true remove animations 253 // True if PrepareForCloseAt has been invoked. When true remove animations
254 // preserve current tab bounds. 254 // preserve current tab bounds.
255 bool in_tab_close_; 255 bool in_tab_close_;
256 256
257 // The size of the new tab button must be hardcoded because we need to be 257 // The size of the new tab button must be hardcoded because we need to be
258 // able to lay it out before we are able to get its image from the 258 // able to lay it out before we are able to get its image from the
259 // ui::ThemeProvider. It also makes sense to do this, because the size of the 259 // ui::ThemeProvider. It also makes sense to do this, because the size of the
260 // new tab button should not need to be calculated dynamically. 260 // new tab button should not need to be calculated dynamically.
261 #if defined(TOUCH_UI)
262 static const int kNewTabButtonWidth = 66;
263 static const int kNewTabButtonHeight = 39;
264 #else
265 static const int kNewTabButtonWidth = 28; 261 static const int kNewTabButtonWidth = 28;
266 static const int kNewTabButtonHeight = 18; 262 static const int kNewTabButtonHeight = 18;
267 #endif
268 263
269 // Valid for the lifetime of a drag over us. 264 // Valid for the lifetime of a drag over us.
270 scoped_ptr<DropInfo> drop_info_; 265 scoped_ptr<DropInfo> drop_info_;
271 266
272 // To ensure all tabs pulse at the same time they share the same animation 267 // To ensure all tabs pulse at the same time they share the same animation
273 // container. This is that animation container. 268 // container. This is that animation container.
274 scoped_refptr<ui::AnimationContainer> animation_container_; 269 scoped_refptr<ui::AnimationContainer> animation_container_;
275 270
276 // Used for stage 1 of new tab animation. 271 // Used for stage 1 of new tab animation.
277 base::OneShotTimer<TabStrip> new_tab_timer_; 272 base::OneShotTimer<TabStrip> new_tab_timer_;
278 273
279 scoped_ptr<views::MouseWatcher> mouse_watcher_; 274 scoped_ptr<views::MouseWatcher> mouse_watcher_;
280 275
281 DISALLOW_COPY_AND_ASSIGN(TabStrip); 276 DISALLOW_COPY_AND_ASSIGN(TabStrip);
282 }; 277 };
283 278
284 #endif // CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_H_ 279 #endif // CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tabs/tab.cc ('k') | chrome/browser/ui/views/tabs/tab_strip.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698