| 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_VIEWS_FRAME_BROWSER_VIEW_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 544 // notification that it succeeded this method is invoked. | 544 // notification that it succeeded this method is invoked. |
| 545 // If |url| is not empty, it is the URL of the page that requested fullscreen | 545 // If |url| is not empty, it is the URL of the page that requested fullscreen |
| 546 // (via the fullscreen JS API). | 546 // (via the fullscreen JS API). |
| 547 // |bubble_type| determines what should be shown in the fullscreen exit | 547 // |bubble_type| determines what should be shown in the fullscreen exit |
| 548 // bubble. | 548 // bubble. |
| 549 void ProcessFullscreen(bool fullscreen, | 549 void ProcessFullscreen(bool fullscreen, |
| 550 FullscreenType fullscreen_type, | 550 FullscreenType fullscreen_type, |
| 551 const GURL& url, | 551 const GURL& url, |
| 552 FullscreenExitBubbleType bubble_type); | 552 FullscreenExitBubbleType bubble_type); |
| 553 | 553 |
| 554 // Returns whether immmersive fullscreen should replace fullscreen. This |
| 555 // should only occur for "browser-fullscreen" for tabbed-typed windows (not |
| 556 // for tab-fullscreen and not for app/popup type windows). |
| 557 bool ShouldUseImmersiveFullscreenForUrl(const GURL& url) const; |
| 558 |
| 554 // Copy the accelerator table from the app resources into something we can | 559 // Copy the accelerator table from the app resources into something we can |
| 555 // use. | 560 // use. |
| 556 void LoadAccelerators(); | 561 void LoadAccelerators(); |
| 557 | 562 |
| 558 // Retrieves the command id for the specified Windows app command. | 563 // Retrieves the command id for the specified Windows app command. |
| 559 int GetCommandIDForAppCommandID(int app_command_id) const; | 564 int GetCommandIDForAppCommandID(int app_command_id) const; |
| 560 | 565 |
| 561 // Initialize the hung plugin detector. | 566 // Initialize the hung plugin detector. |
| 562 void InitHangMonitor(); | 567 void InitHangMonitor(); |
| 563 | 568 |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 773 gfx::ScopedSysColorChangeListener color_change_listener_; | 778 gfx::ScopedSysColorChangeListener color_change_listener_; |
| 774 | 779 |
| 775 scoped_ptr<InstantOverlayControllerViews> overlay_controller_; | 780 scoped_ptr<InstantOverlayControllerViews> overlay_controller_; |
| 776 | 781 |
| 777 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; | 782 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; |
| 778 | 783 |
| 779 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 784 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 780 }; | 785 }; |
| 781 | 786 |
| 782 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 787 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |