| 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 BrowserTest; | 489 friend class BrowserTest; |
| 490 friend class FullscreenControllerInteractiveTest; | 490 friend class FullscreenControllerInteractiveTest; |
| 491 friend class FullscreenControllerTest; | 491 friend class FullscreenControllerTest; |
| 492 FRIEND_TEST_ALL_PREFIXES(AppModeTest, EnableAppModeTest); | 492 FRIEND_TEST_ALL_PREFIXES(AppModeTest, EnableAppModeTest); |
| 493 FRIEND_TEST_ALL_PREFIXES(BrowserTest, NoTabsInPopups); | 493 FRIEND_TEST_ALL_PREFIXES(BrowserTest, NoTabsInPopups); |
| 494 FRIEND_TEST_ALL_PREFIXES(BrowserTest, ConvertTabToAppShortcut); | 494 FRIEND_TEST_ALL_PREFIXES(BrowserTest, ConvertTabToAppShortcut); |
| 495 FRIEND_TEST_ALL_PREFIXES(BrowserTest, OpenAppWindowLikeNtp); | 495 FRIEND_TEST_ALL_PREFIXES(BrowserTest, OpenAppWindowLikeNtp); |
| 496 FRIEND_TEST_ALL_PREFIXES(BrowserTest, AppIdSwitch); | 496 FRIEND_TEST_ALL_PREFIXES(BrowserTest, AppIdSwitch); |
| 497 FRIEND_TEST_ALL_PREFIXES(BrowserWithTestWindowTest, | 497 FRIEND_TEST_ALL_PREFIXES(BrowserWithTestWindowTest, |
| 498 IsReservedCommandOrKeyIsApp); | 498 IsReservedCommandOrKeyIsApp); |
| 499 FRIEND_TEST_ALL_PREFIXES(BrowserWithTestWindowTest, AppFullScreen); |
| 499 FRIEND_TEST_ALL_PREFIXES(FullscreenControllerTest, | 500 FRIEND_TEST_ALL_PREFIXES(FullscreenControllerTest, |
| 500 TabEntersPresentationModeFromWindowed); | 501 TabEntersPresentationModeFromWindowed); |
| 501 FRIEND_TEST_ALL_PREFIXES(FullscreenExitBubbleControllerTest, | 502 FRIEND_TEST_ALL_PREFIXES(FullscreenExitBubbleControllerTest, |
| 502 DenyExitsFullscreen); | 503 DenyExitsFullscreen); |
| 503 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, OpenAppShortcutNoPref); | 504 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, OpenAppShortcutNoPref); |
| 504 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, | 505 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, |
| 505 OpenAppShortcutWindowPref); | 506 OpenAppShortcutWindowPref); |
| 506 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, OpenAppShortcutTabPref); | 507 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, OpenAppShortcutTabPref); |
| 507 | 508 |
| 508 // Used to describe why a tab is being detached. This is used by | 509 // Used to describe why a tab is being detached. This is used by |
| (...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 948 bool window_has_shown_; | 949 bool window_has_shown_; |
| 949 | 950 |
| 950 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 951 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
| 951 // before DidEndColorChooser is called. | 952 // before DidEndColorChooser is called. |
| 952 scoped_ptr<content::ColorChooser> color_chooser_; | 953 scoped_ptr<content::ColorChooser> color_chooser_; |
| 953 | 954 |
| 954 DISALLOW_COPY_AND_ASSIGN(Browser); | 955 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 955 }; | 956 }; |
| 956 | 957 |
| 957 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 958 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |