| 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 464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 475 FullscreenController* fullscreen_controller() { | 475 FullscreenController* fullscreen_controller() { |
| 476 return fullscreen_controller_.get(); | 476 return fullscreen_controller_.get(); |
| 477 } | 477 } |
| 478 | 478 |
| 479 extensions::WindowController* extension_window_controller() const { | 479 extensions::WindowController* extension_window_controller() const { |
| 480 return extension_window_controller_.get(); | 480 return extension_window_controller_.get(); |
| 481 } | 481 } |
| 482 | 482 |
| 483 private: | 483 private: |
| 484 friend class BrowserTest; | 484 friend class BrowserTest; |
| 485 friend class FullscreenControllerInteractiveTest; |
| 485 friend class FullscreenControllerTest; | 486 friend class FullscreenControllerTest; |
| 486 FRIEND_TEST_ALL_PREFIXES(AppModeTest, EnableAppModeTest); | 487 FRIEND_TEST_ALL_PREFIXES(AppModeTest, EnableAppModeTest); |
| 487 FRIEND_TEST_ALL_PREFIXES(BrowserTest, NoTabsInPopups); | 488 FRIEND_TEST_ALL_PREFIXES(BrowserTest, NoTabsInPopups); |
| 488 FRIEND_TEST_ALL_PREFIXES(BrowserTest, ConvertTabToAppShortcut); | 489 FRIEND_TEST_ALL_PREFIXES(BrowserTest, ConvertTabToAppShortcut); |
| 489 FRIEND_TEST_ALL_PREFIXES(BrowserTest, OpenAppWindowLikeNtp); | 490 FRIEND_TEST_ALL_PREFIXES(BrowserTest, OpenAppWindowLikeNtp); |
| 490 FRIEND_TEST_ALL_PREFIXES(BrowserTest, AppIdSwitch); | 491 FRIEND_TEST_ALL_PREFIXES(BrowserTest, AppIdSwitch); |
| 491 FRIEND_TEST_ALL_PREFIXES(FullscreenControllerTest, | 492 FRIEND_TEST_ALL_PREFIXES(FullscreenControllerTest, |
| 492 TabEntersPresentationModeFromWindowed); | 493 TabEntersPresentationModeFromWindowed); |
| 493 FRIEND_TEST_ALL_PREFIXES(FullscreenExitBubbleControllerTest, | 494 FRIEND_TEST_ALL_PREFIXES(FullscreenExitBubbleControllerTest, |
| 494 DenyExitsFullscreen); | 495 DenyExitsFullscreen); |
| (...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 931 bool window_has_shown_; | 932 bool window_has_shown_; |
| 932 | 933 |
| 933 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 934 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
| 934 // before DidEndColorChooser is called. | 935 // before DidEndColorChooser is called. |
| 935 scoped_ptr<content::ColorChooser> color_chooser_; | 936 scoped_ptr<content::ColorChooser> color_chooser_; |
| 936 | 937 |
| 937 DISALLOW_COPY_AND_ASSIGN(Browser); | 938 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 938 }; | 939 }; |
| 939 | 940 |
| 940 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 941 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |