OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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_TABS_TAB_STRIP_MODEL_ORDER_CONTROLLER_H_ | 5 #ifndef CHROME_BROWSER_TABS_TAB_STRIP_MODEL_ORDER_CONTROLLER_H_ |
6 #define CHROME_BROWSER_TABS_TAB_STRIP_MODEL_ORDER_CONTROLLER_H_ | 6 #define CHROME_BROWSER_TABS_TAB_STRIP_MODEL_ORDER_CONTROLLER_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include "chrome/browser/tabs/tab_strip_model.h" | 9 #include "chrome/browser/tabs/tab_strip_model.h" |
10 #include "chrome/common/page_transition_types.h" | 10 #include "chrome/common/page_transition_types.h" |
(...skipping 22 matching lines...) Loading... |
33 // Determine where to place a newly opened tab by using the supplied | 33 // Determine where to place a newly opened tab by using the supplied |
34 // transition and foreground flag to figure out how it was opened. | 34 // transition and foreground flag to figure out how it was opened. |
35 int DetermineInsertionIndex(TabContentsWrapper* new_contents, | 35 int DetermineInsertionIndex(TabContentsWrapper* new_contents, |
36 PageTransition::Type transition, | 36 PageTransition::Type transition, |
37 bool foreground); | 37 bool foreground); |
38 | 38 |
39 // Returns the index to append tabs at. | 39 // Returns the index to append tabs at. |
40 int DetermineInsertionIndexForAppending(); | 40 int DetermineInsertionIndexForAppending(); |
41 | 41 |
42 // Determine where to shift selection after a tab is closed. | 42 // Determine where to shift selection after a tab is closed. |
43 int DetermineNewSelectedIndex(int removed_index) const; | 43 // TODO(sky): nuke reason when we figure out what is causing 34135. |
| 44 int DetermineNewSelectedIndex(int removed_index, volatile int* reason) const; |
44 | 45 |
45 // Overridden from TabStripModelObserver: | 46 // Overridden from TabStripModelObserver: |
46 virtual void TabSelectedAt(TabContentsWrapper* old_contents, | 47 virtual void TabSelectedAt(TabContentsWrapper* old_contents, |
47 TabContentsWrapper* new_contents, | 48 TabContentsWrapper* new_contents, |
48 int index, | 49 int index, |
49 bool user_gesture); | 50 bool user_gesture); |
50 | 51 |
51 private: | 52 private: |
52 // Returns a valid index to be selected after the tab at |removing_index| is | 53 // Returns a valid index to be selected after the tab at |removing_index| is |
53 // closed. If |index| is after |removing_index|, |index| is adjusted to | 54 // closed. If |index| is after |removing_index|, |index| is adjusted to |
54 // reflect the fact that |removing_index| is going away. | 55 // reflect the fact that |removing_index| is going away. |
55 int GetValidIndex(int index, int removing_index) const; | 56 int GetValidIndex(int index, int removing_index) const; |
56 | 57 |
57 TabStripModel* tabstrip_; | 58 TabStripModel* tabstrip_; |
58 | 59 |
59 TabStripModel::InsertionPolicy insertion_policy_; | 60 TabStripModel::InsertionPolicy insertion_policy_; |
60 | 61 |
61 DISALLOW_COPY_AND_ASSIGN(TabStripModelOrderController); | 62 DISALLOW_COPY_AND_ASSIGN(TabStripModelOrderController); |
62 }; | 63 }; |
63 | 64 |
64 #endif // CHROME_BROWSER_TABS_TAB_STRIP_MODEL_ORDER_CONTROLLER_H_ | 65 #endif // CHROME_BROWSER_TABS_TAB_STRIP_MODEL_ORDER_CONTROLLER_H_ |
OLD | NEW |