| 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 585 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 596 | 596 |
| 597 // The TabStrip. | 597 // The TabStrip. |
| 598 AbstractTabStripView* tabstrip_; | 598 AbstractTabStripView* tabstrip_; |
| 599 | 599 |
| 600 // The Toolbar containing the navigation buttons, menus and the address bar. | 600 // The Toolbar containing the navigation buttons, menus and the address bar. |
| 601 ToolbarView* toolbar_; | 601 ToolbarView* toolbar_; |
| 602 | 602 |
| 603 // The Bookmark Bar View for this window. Lazily created. | 603 // The Bookmark Bar View for this window. Lazily created. |
| 604 scoped_ptr<BookmarkBarView> bookmark_bar_view_; | 604 scoped_ptr<BookmarkBarView> bookmark_bar_view_; |
| 605 | 605 |
| 606 #if !defined(OS_CHROMEOS) || defined(USE_AURA) | 606 // The download shelf view (view at the bottom of the page). |
| 607 // The download shelf view (view at the bottom of the page). ChromiumOS | |
| 608 // uses ActiveDownloadsUI instead. | |
| 609 scoped_ptr<DownloadShelfView> download_shelf_; | 607 scoped_ptr<DownloadShelfView> download_shelf_; |
| 610 #endif | |
| 611 | 608 |
| 612 // The InfoBarContainerView that contains InfoBars for the current tab. | 609 // The InfoBarContainerView that contains InfoBars for the current tab. |
| 613 InfoBarContainerView* infobar_container_; | 610 InfoBarContainerView* infobar_container_; |
| 614 | 611 |
| 615 // The view that contains the selected TabContents. | 612 // The view that contains the selected TabContents. |
| 616 TabContentsContainer* contents_container_; | 613 TabContentsContainer* contents_container_; |
| 617 | 614 |
| 618 // The view that contains devtools window for the selected TabContents. | 615 // The view that contains devtools window for the selected TabContents. |
| 619 TabContentsContainer* devtools_container_; | 616 TabContentsContainer* devtools_container_; |
| 620 | 617 |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 690 PendingFullscreenRequest fullscreen_request_; | 687 PendingFullscreenRequest fullscreen_request_; |
| 691 | 688 |
| 692 BrowserWindowMoveObserver* move_observer_; | 689 BrowserWindowMoveObserver* move_observer_; |
| 693 | 690 |
| 694 gfx::ScopedSysColorChangeListener color_change_listener_; | 691 gfx::ScopedSysColorChangeListener color_change_listener_; |
| 695 | 692 |
| 696 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 693 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 697 }; | 694 }; |
| 698 | 695 |
| 699 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 696 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |