| 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 475 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 486 void ShowDownload(content::DownloadItem* download); | 486 void ShowDownload(content::DownloadItem* download); |
| 487 | 487 |
| 488 FullscreenController* fullscreen_controller() const { | 488 FullscreenController* fullscreen_controller() const { |
| 489 return fullscreen_controller_.get(); | 489 return fullscreen_controller_.get(); |
| 490 } | 490 } |
| 491 | 491 |
| 492 extensions::WindowController* extension_window_controller() const { | 492 extensions::WindowController* extension_window_controller() const { |
| 493 return extension_window_controller_.get(); | 493 return extension_window_controller_.get(); |
| 494 } | 494 } |
| 495 | 495 |
| 496 // TODO: Make this asynchronous, see for example RequestMediaAccessPermission |
| 497 // above. (Why is the rest of the WebContentsDelegate methods overriden |
| 498 // privately?) |
| 499 virtual void RequestPresentationMode() OVERRIDE; |
| 500 |
| 496 private: | 501 private: |
| 497 friend class BrowserTest; | 502 friend class BrowserTest; |
| 498 friend class FullscreenControllerInteractiveTest; | 503 friend class FullscreenControllerInteractiveTest; |
| 499 friend class FullscreenControllerTest; | 504 friend class FullscreenControllerTest; |
| 500 FRIEND_TEST_ALL_PREFIXES(AppModeTest, EnableAppModeTest); | 505 FRIEND_TEST_ALL_PREFIXES(AppModeTest, EnableAppModeTest); |
| 501 FRIEND_TEST_ALL_PREFIXES(BrowserCommandControllerTest, | 506 FRIEND_TEST_ALL_PREFIXES(BrowserCommandControllerTest, |
| 502 IsReservedCommandOrKeyIsApp); | 507 IsReservedCommandOrKeyIsApp); |
| 503 FRIEND_TEST_ALL_PREFIXES(BrowserCommandControllerTest, AppFullScreen); | 508 FRIEND_TEST_ALL_PREFIXES(BrowserCommandControllerTest, AppFullScreen); |
| 504 FRIEND_TEST_ALL_PREFIXES(BrowserTest, NoTabsInPopups); | 509 FRIEND_TEST_ALL_PREFIXES(BrowserTest, NoTabsInPopups); |
| 505 FRIEND_TEST_ALL_PREFIXES(BrowserTest, ConvertTabToAppShortcut); | 510 FRIEND_TEST_ALL_PREFIXES(BrowserTest, ConvertTabToAppShortcut); |
| (...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 940 | 945 |
| 941 // The following factory is used to close the frame at a later time. | 946 // The following factory is used to close the frame at a later time. |
| 942 base::WeakPtrFactory<Browser> weak_factory_; | 947 base::WeakPtrFactory<Browser> weak_factory_; |
| 943 | 948 |
| 944 scoped_ptr<BrowserLanguageStateObserver> language_state_observer_; | 949 scoped_ptr<BrowserLanguageStateObserver> language_state_observer_; |
| 945 | 950 |
| 946 DISALLOW_COPY_AND_ASSIGN(Browser); | 951 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 947 }; | 952 }; |
| 948 | 953 |
| 949 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 954 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |