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 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <set> | 9 #include <set> |
10 #include <string> | 10 #include <string> |
(...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
487 friend class BrowserTest; | 487 friend class BrowserTest; |
488 friend class FullscreenControllerInteractiveTest; | 488 friend class FullscreenControllerInteractiveTest; |
489 friend class FullscreenControllerTest; | 489 friend class FullscreenControllerTest; |
490 FRIEND_TEST_ALL_PREFIXES(AppModeTest, EnableAppModeTest); | 490 FRIEND_TEST_ALL_PREFIXES(AppModeTest, EnableAppModeTest); |
491 FRIEND_TEST_ALL_PREFIXES(BrowserTest, NoTabsInPopups); | 491 FRIEND_TEST_ALL_PREFIXES(BrowserTest, NoTabsInPopups); |
492 FRIEND_TEST_ALL_PREFIXES(BrowserTest, ConvertTabToAppShortcut); | 492 FRIEND_TEST_ALL_PREFIXES(BrowserTest, ConvertTabToAppShortcut); |
493 FRIEND_TEST_ALL_PREFIXES(BrowserTest, OpenAppWindowLikeNtp); | 493 FRIEND_TEST_ALL_PREFIXES(BrowserTest, OpenAppWindowLikeNtp); |
494 FRIEND_TEST_ALL_PREFIXES(BrowserTest, AppIdSwitch); | 494 FRIEND_TEST_ALL_PREFIXES(BrowserTest, AppIdSwitch); |
495 FRIEND_TEST_ALL_PREFIXES(BrowserWithTestWindowTest, | 495 FRIEND_TEST_ALL_PREFIXES(BrowserWithTestWindowTest, |
496 IsReservedCommandOrKeyIsApp); | 496 IsReservedCommandOrKeyIsApp); |
| 497 FRIEND_TEST_ALL_PREFIXES(BrowserWithTestWindowTest, AppFullScreen); |
497 FRIEND_TEST_ALL_PREFIXES(FullscreenControllerTest, | 498 FRIEND_TEST_ALL_PREFIXES(FullscreenControllerTest, |
498 TabEntersPresentationModeFromWindowed); | 499 TabEntersPresentationModeFromWindowed); |
499 FRIEND_TEST_ALL_PREFIXES(FullscreenExitBubbleControllerTest, | 500 FRIEND_TEST_ALL_PREFIXES(FullscreenExitBubbleControllerTest, |
500 DenyExitsFullscreen); | 501 DenyExitsFullscreen); |
501 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, OpenAppShortcutNoPref); | 502 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, OpenAppShortcutNoPref); |
502 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, | 503 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, |
503 OpenAppShortcutWindowPref); | 504 OpenAppShortcutWindowPref); |
504 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, OpenAppShortcutTabPref); | 505 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, OpenAppShortcutTabPref); |
505 | 506 |
506 // Used to describe why a tab is being detached. This is used by | 507 // Used to describe why a tab is being detached. This is used by |
(...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
941 bool window_has_shown_; | 942 bool window_has_shown_; |
942 | 943 |
943 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 944 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
944 // before DidEndColorChooser is called. | 945 // before DidEndColorChooser is called. |
945 scoped_ptr<content::ColorChooser> color_chooser_; | 946 scoped_ptr<content::ColorChooser> color_chooser_; |
946 | 947 |
947 DISALLOW_COPY_AND_ASSIGN(Browser); | 948 DISALLOW_COPY_AND_ASSIGN(Browser); |
948 }; | 949 }; |
949 | 950 |
950 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 951 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |