| 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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 #endif | 60 #endif |
| 61 | 61 |
| 62 #if defined(USE_AURA) | 62 #if defined(USE_AURA) |
| 63 class LauncherUpdater; | 63 class LauncherUpdater; |
| 64 #endif | 64 #endif |
| 65 | 65 |
| 66 namespace views { | 66 namespace views { |
| 67 class AccessiblePaneView; | 67 class AccessiblePaneView; |
| 68 class ExternalFocusTracker; | 68 class ExternalFocusTracker; |
| 69 class Menu; | 69 class Menu; |
| 70 class WebView; |
| 70 } | 71 } |
| 71 | 72 |
| 72 /////////////////////////////////////////////////////////////////////////////// | 73 /////////////////////////////////////////////////////////////////////////////// |
| 73 // BrowserView | 74 // BrowserView |
| 74 // | 75 // |
| 75 // A ClientView subclass that provides the contents of a browser window, | 76 // A ClientView subclass that provides the contents of a browser window, |
| 76 // including the TabStrip, toolbars, download shelves, the content area etc. | 77 // including the TabStrip, toolbars, download shelves, the content area etc. |
| 77 // | 78 // |
| 78 class BrowserView : public BrowserWindow, | 79 class BrowserView : public BrowserWindow, |
| 79 public BrowserWindowTesting, | 80 public BrowserWindowTesting, |
| (...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 606 #if !defined(OS_CHROMEOS) || defined(USE_AURA) | 607 #if !defined(OS_CHROMEOS) || defined(USE_AURA) |
| 607 // The download shelf view (view at the bottom of the page). ChromiumOS | 608 // The download shelf view (view at the bottom of the page). ChromiumOS |
| 608 // uses ActiveDownloadsUI instead. | 609 // uses ActiveDownloadsUI instead. |
| 609 scoped_ptr<DownloadShelfView> download_shelf_; | 610 scoped_ptr<DownloadShelfView> download_shelf_; |
| 610 #endif | 611 #endif |
| 611 | 612 |
| 612 // The InfoBarContainerView that contains InfoBars for the current tab. | 613 // The InfoBarContainerView that contains InfoBars for the current tab. |
| 613 InfoBarContainerView* infobar_container_; | 614 InfoBarContainerView* infobar_container_; |
| 614 | 615 |
| 615 // The view that contains the selected TabContents. | 616 // The view that contains the selected TabContents. |
| 616 TabContentsContainer* contents_container_; | 617 views::WebView* contents_container_; |
| 617 | 618 |
| 618 // The view that contains devtools window for the selected TabContents. | 619 // The view that contains devtools window for the selected TabContents. |
| 619 TabContentsContainer* devtools_container_; | 620 TabContentsContainer* devtools_container_; |
| 620 | 621 |
| 621 // The view that contains instant's TabContents. | 622 // The view that contains instant's TabContents. |
| 622 TabContentsContainer* preview_container_; | 623 views::WebView* preview_container_; |
| 623 | 624 |
| 624 // The view managing both the contents_container_ and preview_container_. | 625 // The view managing both the contents_container_ and preview_container_. |
| 625 ContentsContainer* contents_; | 626 ContentsContainer* contents_; |
| 626 | 627 |
| 627 // Split view containing the contents container and devtools container. | 628 // Split view containing the contents container and devtools container. |
| 628 views::SingleSplitView* contents_split_; | 629 views::SingleSplitView* contents_split_; |
| 629 | 630 |
| 630 // Side to dock devtools to | 631 // Side to dock devtools to |
| 631 DevToolsDockSide devtools_dock_side_; | 632 DevToolsDockSide devtools_dock_side_; |
| 632 | 633 |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 690 PendingFullscreenRequest fullscreen_request_; | 691 PendingFullscreenRequest fullscreen_request_; |
| 691 | 692 |
| 692 BrowserWindowMoveObserver* move_observer_; | 693 BrowserWindowMoveObserver* move_observer_; |
| 693 | 694 |
| 694 gfx::ScopedSysColorChangeListener color_change_listener_; | 695 gfx::ScopedSysColorChangeListener color_change_listener_; |
| 695 | 696 |
| 696 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 697 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 697 }; | 698 }; |
| 698 | 699 |
| 699 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 700 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |