| 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 479 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 490 FRIEND_TEST_ALL_PREFIXES(BrowserTest, OpenAppWindowLikeNtp); | 490 FRIEND_TEST_ALL_PREFIXES(BrowserTest, OpenAppWindowLikeNtp); |
| 491 FRIEND_TEST_ALL_PREFIXES(BrowserTest, AppIdSwitch); | 491 FRIEND_TEST_ALL_PREFIXES(BrowserTest, AppIdSwitch); |
| 492 FRIEND_TEST_ALL_PREFIXES(FullscreenControllerTest, | 492 FRIEND_TEST_ALL_PREFIXES(FullscreenControllerTest, |
| 493 TabEntersPresentationModeFromWindowed); | 493 TabEntersPresentationModeFromWindowed); |
| 494 FRIEND_TEST_ALL_PREFIXES(FullscreenExitBubbleControllerTest, | 494 FRIEND_TEST_ALL_PREFIXES(FullscreenExitBubbleControllerTest, |
| 495 DenyExitsFullscreen); | 495 DenyExitsFullscreen); |
| 496 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, OpenAppShortcutNoPref); | 496 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, OpenAppShortcutNoPref); |
| 497 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, | 497 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, |
| 498 OpenAppShortcutWindowPref); | 498 OpenAppShortcutWindowPref); |
| 499 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, OpenAppShortcutTabPref); | 499 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, OpenAppShortcutTabPref); |
| 500 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, OpenAppShortcutPanel); | |
| 501 | 500 |
| 502 // Used to describe why a tab is being detached. This is used by | 501 // Used to describe why a tab is being detached. This is used by |
| 503 // TabDetachedAtImpl. | 502 // TabDetachedAtImpl. |
| 504 enum DetachType { | 503 enum DetachType { |
| 505 // Result of TabDetachedAt. | 504 // Result of TabDetachedAt. |
| 506 DETACH_TYPE_DETACH, | 505 DETACH_TYPE_DETACH, |
| 507 | 506 |
| 508 // Result of TabReplacedAt. | 507 // Result of TabReplacedAt. |
| 509 DETACH_TYPE_REPLACE, | 508 DETACH_TYPE_REPLACE, |
| 510 | 509 |
| (...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 933 bool window_has_shown_; | 932 bool window_has_shown_; |
| 934 | 933 |
| 935 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 934 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
| 936 // before DidEndColorChooser is called. | 935 // before DidEndColorChooser is called. |
| 937 scoped_ptr<content::ColorChooser> color_chooser_; | 936 scoped_ptr<content::ColorChooser> color_chooser_; |
| 938 | 937 |
| 939 DISALLOW_COPY_AND_ASSIGN(Browser); | 938 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 940 }; | 939 }; |
| 941 | 940 |
| 942 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 941 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |