OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 855 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
866 FRIEND_TEST_ALL_PREFIXES(BrowserTest, AppIdSwitch); | 866 FRIEND_TEST_ALL_PREFIXES(BrowserTest, AppIdSwitch); |
867 FRIEND_TEST_ALL_PREFIXES(FullscreenControllerTest, | 867 FRIEND_TEST_ALL_PREFIXES(FullscreenControllerTest, |
868 TabEntersPresentationModeFromWindowed); | 868 TabEntersPresentationModeFromWindowed); |
869 FRIEND_TEST_ALL_PREFIXES(FullscreenExitBubbleControllerTest, | 869 FRIEND_TEST_ALL_PREFIXES(FullscreenExitBubbleControllerTest, |
870 DenyExitsFullscreen); | 870 DenyExitsFullscreen); |
871 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, OpenAppShortcutNoPref); | 871 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, OpenAppShortcutNoPref); |
872 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, | 872 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, |
873 OpenAppShortcutWindowPref); | 873 OpenAppShortcutWindowPref); |
874 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, OpenAppShortcutTabPref); | 874 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, OpenAppShortcutTabPref); |
875 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, OpenAppShortcutPanel); | 875 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, OpenAppShortcutPanel); |
876 FRIEND_TEST_ALL_PREFIXES(FullscreenControllerTest, | |
877 TestTabExitsFullscreenOnNavigation); | |
878 FRIEND_TEST_ALL_PREFIXES(FullscreenControllerTest, | |
879 TestTabDoesntExitFullscreenOnSubFrameNavigation); | |
scheib
2012/06/15 16:12:31
FullscreenControllerTest is already a friend, we s
koz (OOO until 15th September)
2012/06/18 02:28:10
Cool! Done.
| |
876 | 880 |
877 // Used to describe why a tab is being detached. This is used by | 881 // Used to describe why a tab is being detached. This is used by |
878 // TabDetachedAtImpl. | 882 // TabDetachedAtImpl. |
879 enum DetachType { | 883 enum DetachType { |
880 // Result of TabDetachedAt. | 884 // Result of TabDetachedAt. |
881 DETACH_TYPE_DETACH, | 885 DETACH_TYPE_DETACH, |
882 | 886 |
883 // Result of TabReplacedAt. | 887 // Result of TabReplacedAt. |
884 DETACH_TYPE_REPLACE, | 888 DETACH_TYPE_REPLACE, |
885 | 889 |
(...skipping 575 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1461 bool window_has_shown_; | 1465 bool window_has_shown_; |
1462 | 1466 |
1463 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 1467 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
1464 // before DidEndColorChooser is called. | 1468 // before DidEndColorChooser is called. |
1465 scoped_ptr<content::ColorChooser> color_chooser_; | 1469 scoped_ptr<content::ColorChooser> color_chooser_; |
1466 | 1470 |
1467 DISALLOW_COPY_AND_ASSIGN(Browser); | 1471 DISALLOW_COPY_AND_ASSIGN(Browser); |
1468 }; | 1472 }; |
1469 | 1473 |
1470 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1474 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |