| OLD | NEW |
| 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2009 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_VIEWS_FRAME_BROWSER_VIEW_H_ | 5 #ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_ |
| 6 #define CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_ | 6 #define CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 | 9 |
| 10 #include "base/gfx/native_widget_types.h" | 10 #include "base/gfx/native_widget_types.h" |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 class InfoBarContainer; | 39 class InfoBarContainer; |
| 40 class LocationBarView; | 40 class LocationBarView; |
| 41 class StatusBubbleViews; | 41 class StatusBubbleViews; |
| 42 class TabContentsContainer; | 42 class TabContentsContainer; |
| 43 class TabStrip; | 43 class TabStrip; |
| 44 class ToolbarView; | 44 class ToolbarView; |
| 45 class ZoomMenuModel; | 45 class ZoomMenuModel; |
| 46 | 46 |
| 47 namespace views { | 47 namespace views { |
| 48 class Menu; | 48 class Menu; |
| 49 class SingleSplitView; |
| 49 } | 50 } |
| 50 | 51 |
| 51 /////////////////////////////////////////////////////////////////////////////// | 52 /////////////////////////////////////////////////////////////////////////////// |
| 52 // BrowserView | 53 // BrowserView |
| 53 // | 54 // |
| 54 // A ClientView subclass that provides the contents of a browser window, | 55 // A ClientView subclass that provides the contents of a browser window, |
| 55 // including the TabStrip, toolbars, download shelves, the content area etc. | 56 // including the TabStrip, toolbars, download shelves, the content area etc. |
| 56 // | 57 // |
| 57 class BrowserView : public BrowserWindow, | 58 class BrowserView : public BrowserWindow, |
| 58 public BrowserWindowTesting, | 59 public BrowserWindowTesting, |
| (...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 332 // Browser type) and there should be a subsequent re-layout to show it. | 333 // Browser type) and there should be a subsequent re-layout to show it. |
| 333 // |contents| can be NULL. | 334 // |contents| can be NULL. |
| 334 bool MaybeShowBookmarkBar(TabContents* contents); | 335 bool MaybeShowBookmarkBar(TabContents* contents); |
| 335 | 336 |
| 336 // Prepare to show an Info Bar for the specified TabContents. Returns true | 337 // Prepare to show an Info Bar for the specified TabContents. Returns true |
| 337 // if there is an Info Bar to show and one is supported for this Browser | 338 // if there is an Info Bar to show and one is supported for this Browser |
| 338 // type, and there should be a subsequent re-layout to show it. | 339 // type, and there should be a subsequent re-layout to show it. |
| 339 // |contents| can be NULL. | 340 // |contents| can be NULL. |
| 340 bool MaybeShowInfoBar(TabContents* contents); | 341 bool MaybeShowInfoBar(TabContents* contents); |
| 341 | 342 |
| 343 // Updated devtools window for given contents. |
| 344 void UpdateDevToolsForContents(TabContents* tab_contents); |
| 345 |
| 342 // Updates various optional child Views, e.g. Bookmarks Bar, Info Bar or the | 346 // Updates various optional child Views, e.g. Bookmarks Bar, Info Bar or the |
| 343 // Download Shelf in response to a change notification from the specified | 347 // Download Shelf in response to a change notification from the specified |
| 344 // |contents|. |contents| can be NULL. In this case, all optional UI will be | 348 // |contents|. |contents| can be NULL. In this case, all optional UI will be |
| 345 // removed. | 349 // removed. |
| 346 void UpdateUIForContents(TabContents* contents); | 350 void UpdateUIForContents(TabContents* contents); |
| 347 | 351 |
| 348 // Updates an optional child View, e.g. Bookmarks Bar, Info Bar, Download | 352 // Updates an optional child View, e.g. Bookmarks Bar, Info Bar, Download |
| 349 // Shelf. If |*old_view| differs from new_view, the old_view is removed and | 353 // Shelf. If |*old_view| differs from new_view, the old_view is removed and |
| 350 // the new_view is added. This is intended to be used when swapping in/out | 354 // the new_view is added. This is intended to be used when swapping in/out |
| 351 // child views that are referenced via a field. | 355 // child views that are referenced via a field. |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 399 | 403 |
| 400 // The InfoBarContainer that contains InfoBars for the current tab. | 404 // The InfoBarContainer that contains InfoBars for the current tab. |
| 401 InfoBarContainer* infobar_container_; | 405 InfoBarContainer* infobar_container_; |
| 402 | 406 |
| 403 // The distance the FindBar is from the top of the window, in pixels. | 407 // The distance the FindBar is from the top of the window, in pixels. |
| 404 int find_bar_y_; | 408 int find_bar_y_; |
| 405 | 409 |
| 406 // The view that contains the selected TabContents. | 410 // The view that contains the selected TabContents. |
| 407 TabContentsContainer* contents_container_; | 411 TabContentsContainer* contents_container_; |
| 408 | 412 |
| 413 // The view that contains devtools window for the selected TabContents. |
| 414 TabContentsContainer* devtools_container_; |
| 415 |
| 416 // Split view containing the contents container and devtools container. |
| 417 views::SingleSplitView* contents_split_; |
| 418 |
| 409 // The Status information bubble that appears at the bottom of the window. | 419 // The Status information bubble that appears at the bottom of the window. |
| 410 scoped_ptr<StatusBubbleViews> status_bubble_; | 420 scoped_ptr<StatusBubbleViews> status_bubble_; |
| 411 | 421 |
| 412 // A mapping between accelerators and commands. | 422 // A mapping between accelerators and commands. |
| 413 scoped_ptr< std::map<views::Accelerator, int> > accelerator_table_; | 423 scoped_ptr< std::map<views::Accelerator, int> > accelerator_table_; |
| 414 | 424 |
| 415 // True if we have already been initialized. | 425 // True if we have already been initialized. |
| 416 bool initialized_; | 426 bool initialized_; |
| 417 | 427 |
| 418 // True if we should ignore requests to layout. This is set while toggling | 428 // True if we should ignore requests to layout. This is set while toggling |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 455 // A bottom bar for showing extensions. | 465 // A bottom bar for showing extensions. |
| 456 ExtensionShelf* extension_shelf_; | 466 ExtensionShelf* extension_shelf_; |
| 457 | 467 |
| 458 typedef std::set<BrowserBubble*> BubbleSet; | 468 typedef std::set<BrowserBubble*> BubbleSet; |
| 459 BubbleSet browser_bubbles_; | 469 BubbleSet browser_bubbles_; |
| 460 | 470 |
| 461 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 471 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 462 }; | 472 }; |
| 463 | 473 |
| 464 #endif // CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_ | 474 #endif // CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |