| 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 373 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 384 // The TabStrip. | 384 // The TabStrip. |
| 385 TabStrip* tabstrip_; | 385 TabStrip* tabstrip_; |
| 386 | 386 |
| 387 // The Toolbar containing the navigation buttons, menus and the address bar. | 387 // The Toolbar containing the navigation buttons, menus and the address bar. |
| 388 ToolbarView* toolbar_; | 388 ToolbarView* toolbar_; |
| 389 | 389 |
| 390 // The Bookmark Bar View for this window. Lazily created. | 390 // The Bookmark Bar View for this window. Lazily created. |
| 391 scoped_ptr<BookmarkBarView> bookmark_bar_view_; | 391 scoped_ptr<BookmarkBarView> bookmark_bar_view_; |
| 392 | 392 |
| 393 // The download shelf view (view at the bottom of the page). | 393 // The download shelf view (view at the bottom of the page). |
| 394 DownloadShelfView* download_shelf_; | 394 scoped_ptr<DownloadShelfView> download_shelf_; |
| 395 | 395 |
| 396 // The InfoBarContainer that contains InfoBars for the current tab. | 396 // The InfoBarContainer that contains InfoBars for the current tab. |
| 397 InfoBarContainer* infobar_container_; | 397 InfoBarContainer* infobar_container_; |
| 398 | 398 |
| 399 // The distance the FindBar is from the top of the window, in pixels. | 399 // The distance the FindBar is from the top of the window, in pixels. |
| 400 int find_bar_y_; | 400 int find_bar_y_; |
| 401 | 401 |
| 402 // The view that contains the selected TabContents. | 402 // The view that contains the selected TabContents. |
| 403 TabContentsContainer* contents_container_; | 403 TabContentsContainer* contents_container_; |
| 404 | 404 |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 451 // A bottom bar for showing extensions. | 451 // A bottom bar for showing extensions. |
| 452 ExtensionShelf* extension_shelf_; | 452 ExtensionShelf* extension_shelf_; |
| 453 | 453 |
| 454 typedef std::set<BrowserBubble*> BubbleSet; | 454 typedef std::set<BrowserBubble*> BubbleSet; |
| 455 BubbleSet browser_bubbles_; | 455 BubbleSet browser_bubbles_; |
| 456 | 456 |
| 457 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 457 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 458 }; | 458 }; |
| 459 | 459 |
| 460 #endif // CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_ | 460 #endif // CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |