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_UI_BROWSER_H_ | 5 #ifndef CHROME_BROWSER_UI_BROWSER_H_ |
6 #define CHROME_BROWSER_UI_BROWSER_H_ | 6 #define CHROME_BROWSER_UI_BROWSER_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include <map> | 9 #include <map> |
10 #include <set> | 10 #include <set> |
(...skipping 681 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
692 int from_index, | 692 int from_index, |
693 int to_index); | 693 int to_index); |
694 virtual void TabReplacedAt(TabContentsWrapper* old_contents, | 694 virtual void TabReplacedAt(TabContentsWrapper* old_contents, |
695 TabContentsWrapper* new_contents, | 695 TabContentsWrapper* new_contents, |
696 int index); | 696 int index); |
697 virtual void TabPinnedStateChanged(TabContentsWrapper* contents, int index); | 697 virtual void TabPinnedStateChanged(TabContentsWrapper* contents, int index); |
698 virtual void TabStripEmpty(); | 698 virtual void TabStripEmpty(); |
699 | 699 |
700 private: | 700 private: |
701 FRIEND_TEST_ALL_PREFIXES(BrowserTest, NoTabsInPopups); | 701 FRIEND_TEST_ALL_PREFIXES(BrowserTest, NoTabsInPopups); |
| 702 FRIEND_TEST_ALL_PREFIXES(BrowserTest, ConvertTabToAppShortcut); |
702 | 703 |
703 // Used to describe why a tab is being detached. This is used by | 704 // Used to describe why a tab is being detached. This is used by |
704 // TabDetachedAtImpl. | 705 // TabDetachedAtImpl. |
705 enum DetachType { | 706 enum DetachType { |
706 // Result of TabDetachedAt. | 707 // Result of TabDetachedAt. |
707 DETACH_TYPE_DETACH, | 708 DETACH_TYPE_DETACH, |
708 | 709 |
709 // Result of TabReplacedAt. | 710 // Result of TabReplacedAt. |
710 DETACH_TYPE_REPLACE, | 711 DETACH_TYPE_REPLACE, |
711 | 712 |
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1107 // The profile's tab restore service. The service is owned by the profile, | 1108 // The profile's tab restore service. The service is owned by the profile, |
1108 // and we install ourselves as an observer. | 1109 // and we install ourselves as an observer. |
1109 TabRestoreService* tab_restore_service_; | 1110 TabRestoreService* tab_restore_service_; |
1110 | 1111 |
1111 scoped_ptr<InstantController> instant_; | 1112 scoped_ptr<InstantController> instant_; |
1112 | 1113 |
1113 DISALLOW_COPY_AND_ASSIGN(Browser); | 1114 DISALLOW_COPY_AND_ASSIGN(Browser); |
1114 }; | 1115 }; |
1115 | 1116 |
1116 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1117 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |