| 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 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <map> | 9 #include <map> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 487 // Updates an optional child View, e.g. Bookmarks Bar, Info Bar, Download | 487 // Updates an optional child View, e.g. Bookmarks Bar, Info Bar, Download |
| 488 // Shelf. If |*old_view| differs from new_view, the old_view is removed and | 488 // Shelf. If |*old_view| differs from new_view, the old_view is removed and |
| 489 // the new_view is added. This is intended to be used when swapping in/out | 489 // the new_view is added. This is intended to be used when swapping in/out |
| 490 // child views that are referenced via a field. | 490 // child views that are referenced via a field. |
| 491 // Returns true if anything was changed, and a re-Layout is now required. | 491 // Returns true if anything was changed, and a re-Layout is now required. |
| 492 bool UpdateChildViewAndLayout(views::View* new_view, views::View** old_view); | 492 bool UpdateChildViewAndLayout(views::View* new_view, views::View** old_view); |
| 493 | 493 |
| 494 // Invoked to update the necessary things when our fullscreen state changes | 494 // Invoked to update the necessary things when our fullscreen state changes |
| 495 // to |fullscreen|. On Windows this is invoked immediately when we toggle the | 495 // to |fullscreen|. On Windows this is invoked immediately when we toggle the |
| 496 // full screen state. On Linux changing the fullscreen state is async, so we | 496 // full screen state. On Linux changing the fullscreen state is async, so we |
| 497 // ask the window to change it's fullscreen state, then when we get | 497 // ask the window to change its fullscreen state, then when we get |
| 498 // notification that it succeeded this method is invoked. | 498 // notification that it succeeded this method is invoked. |
| 499 // If |url| is not empty, it is the URL of the page that requested fullscreen | 499 // If |url| is not empty, it is the URL of the page that requested fullscreen |
| 500 // (via the fullscreen JS API). | 500 // (via the fullscreen JS API). |
| 501 // |bubble_type| determines what should be shown in the fullscreen exit | 501 // |bubble_type| determines what should be shown in the fullscreen exit |
| 502 // bubble. | 502 // bubble. |
| 503 void ProcessFullscreen(bool fullscreen, | 503 void ProcessFullscreen(bool fullscreen, |
| 504 const GURL& url, | 504 const GURL& url, |
| 505 FullscreenExitBubbleType bubble_type); | 505 FullscreenExitBubbleType bubble_type); |
| 506 | 506 |
| 507 // Copy the accelerator table from the app resources into something we can | 507 // Copy the accelerator table from the app resources into something we can |
| (...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 685 PendingFullscreenRequest fullscreen_request_; | 685 PendingFullscreenRequest fullscreen_request_; |
| 686 | 686 |
| 687 BrowserWindowMoveObserver* move_observer_; | 687 BrowserWindowMoveObserver* move_observer_; |
| 688 | 688 |
| 689 gfx::ScopedSysColorChangeListener color_change_listener_; | 689 gfx::ScopedSysColorChangeListener color_change_listener_; |
| 690 | 690 |
| 691 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 691 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 692 }; | 692 }; |
| 693 | 693 |
| 694 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 694 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |