| 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 478 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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(BrowserCommandControllerTest, | 491 FRIEND_TEST_ALL_PREFIXES(BrowserCommandControllerTest, |
| 492 IsReservedCommandOrKeyIsApp); | 492 IsReservedCommandOrKeyIsApp); |
| 493 FRIEND_TEST_ALL_PREFIXES(BrowserCommandControllerTest, AppFullScreen); | 493 FRIEND_TEST_ALL_PREFIXES(BrowserCommandControllerTest, AppFullScreen); |
| 494 FRIEND_TEST_ALL_PREFIXES(BrowserTest, NoTabsInPopups); | 494 FRIEND_TEST_ALL_PREFIXES(BrowserTest, NoTabsInPopups); |
| 495 FRIEND_TEST_ALL_PREFIXES(BrowserTest, ConvertTabToAppShortcut); | 495 FRIEND_TEST_ALL_PREFIXES(BrowserTest, ConvertTabToAppShortcut); |
| 496 FRIEND_TEST_ALL_PREFIXES(BrowserTest, OpenAppWindowLikeNtp); | 496 FRIEND_TEST_ALL_PREFIXES(BrowserTest, OpenAppWindowLikeNtp); |
| 497 FRIEND_TEST_ALL_PREFIXES(BrowserTest, AppIdSwitch); | 497 FRIEND_TEST_ALL_PREFIXES(BrowserTest, AppIdSwitch); |
| 498 FRIEND_TEST_ALL_PREFIXES(BrowserTest, ShouldShowLocationBar); | 498 FRIEND_TEST_ALL_PREFIXES(BrowserTest, ShouldShowLocationBar); |
| 499 FRIEND_TEST_ALL_PREFIXES(ExclusiveAccessBubbleWindowControllerTest, |
| 500 DenyExitsFullscreen); |
| 499 FRIEND_TEST_ALL_PREFIXES(FullscreenControllerTest, | 501 FRIEND_TEST_ALL_PREFIXES(FullscreenControllerTest, |
| 500 TabEntersPresentationModeFromWindowed); | 502 TabEntersPresentationModeFromWindowed); |
| 501 FRIEND_TEST_ALL_PREFIXES(FullscreenExitBubbleControllerTest, | |
| 502 DenyExitsFullscreen); | |
| 503 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, OpenAppShortcutNoPref); | 503 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, OpenAppShortcutNoPref); |
| 504 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, | 504 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, |
| 505 OpenAppShortcutWindowPref); | 505 OpenAppShortcutWindowPref); |
| 506 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, OpenAppShortcutTabPref); | 506 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, OpenAppShortcutTabPref); |
| 507 | 507 |
| 508 class InterstitialObserver; | 508 class InterstitialObserver; |
| 509 | 509 |
| 510 // Used to describe why a tab is being detached. This is used by | 510 // Used to describe why a tab is being detached. This is used by |
| 511 // TabDetachedAtImpl. | 511 // TabDetachedAtImpl. |
| 512 enum DetachType { | 512 enum DetachType { |
| (...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 969 // The following factory is used for chrome update coalescing. | 969 // The following factory is used for chrome update coalescing. |
| 970 base::WeakPtrFactory<Browser> chrome_updater_factory_; | 970 base::WeakPtrFactory<Browser> chrome_updater_factory_; |
| 971 | 971 |
| 972 // The following factory is used to close the frame at a later time. | 972 // The following factory is used to close the frame at a later time. |
| 973 base::WeakPtrFactory<Browser> weak_factory_; | 973 base::WeakPtrFactory<Browser> weak_factory_; |
| 974 | 974 |
| 975 DISALLOW_COPY_AND_ASSIGN(Browser); | 975 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 976 }; | 976 }; |
| 977 | 977 |
| 978 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 978 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |