| OLD | NEW |
| 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 #include "chrome/browser/ui/touch/tabs/touch_tab_strip.h" | 5 #include "chrome/browser/ui/touch/tabs/touch_tab_strip.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 | 9 |
| 10 #include "chrome/browser/ui/touch/tabs/touch_tab.h" | 10 #include "chrome/browser/ui/touch/tabs/touch_tab.h" |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 } | 79 } |
| 80 | 80 |
| 81 BaseTab* TouchTabStrip::CreateTabForDragging() { | 81 BaseTab* TouchTabStrip::CreateTabForDragging() { |
| 82 return NULL; | 82 return NULL; |
| 83 } | 83 } |
| 84 | 84 |
| 85 void TouchTabStrip::RemoveTabAt(int model_index) { | 85 void TouchTabStrip::RemoveTabAt(int model_index) { |
| 86 StartRemoveTabAnimation(model_index); | 86 StartRemoveTabAnimation(model_index); |
| 87 } | 87 } |
| 88 | 88 |
| 89 void TouchTabStrip::SelectTabAt(int old_model_index, int new_model_index) { | 89 void SetSelection(const TabStripSelectionModel& old_selection, |
| 90 const TabStripSelectionModel& new_selection) { |
| 90 SchedulePaint(); | 91 SchedulePaint(); |
| 91 } | 92 } |
| 92 | 93 |
| 93 void TouchTabStrip::TabTitleChangedNotLoading(int model_index) { | 94 void TouchTabStrip::TabTitleChangedNotLoading(int model_index) { |
| 94 } | 95 } |
| 95 | 96 |
| 96 BaseTab* TouchTabStrip::CreateTab() { | 97 BaseTab* TouchTabStrip::CreateTab() { |
| 97 return new TouchTab(this); | 98 return new TouchTab(this); |
| 98 } | 99 } |
| 99 | 100 |
| (...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 358 last_tapped_view_ = view; | 359 last_tapped_view_ = view; |
| 359 return ui::TOUCH_STATUS_UNKNOWN; | 360 return ui::TOUCH_STATUS_UNKNOWN; |
| 360 } | 361 } |
| 361 | 362 |
| 362 void TouchTabStrip::ViewHierarchyChanged(bool is_add, | 363 void TouchTabStrip::ViewHierarchyChanged(bool is_add, |
| 363 View* parent, | 364 View* parent, |
| 364 View* child) { | 365 View* child) { |
| 365 if (!is_add && last_tapped_view_ == child) | 366 if (!is_add && last_tapped_view_ == child) |
| 366 last_tapped_view_ = NULL; | 367 last_tapped_view_ = NULL; |
| 367 } | 368 } |
| OLD | NEW |