Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(51)

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.h

Issue 10086026: Revert 132281 - Add more functionality to WebView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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
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;
71 } 70 }
72 71
73 /////////////////////////////////////////////////////////////////////////////// 72 ///////////////////////////////////////////////////////////////////////////////
74 // BrowserView 73 // BrowserView
75 // 74 //
76 // A ClientView subclass that provides the contents of a browser window, 75 // A ClientView subclass that provides the contents of a browser window,
77 // including the TabStrip, toolbars, download shelves, the content area etc. 76 // including the TabStrip, toolbars, download shelves, the content area etc.
78 // 77 //
79 class BrowserView : public BrowserWindow, 78 class BrowserView : public BrowserWindow,
80 public BrowserWindowTesting, 79 public BrowserWindowTesting,
(...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after
607 #if !defined(OS_CHROMEOS) || defined(USE_AURA) 606 #if !defined(OS_CHROMEOS) || defined(USE_AURA)
608 // The download shelf view (view at the bottom of the page). ChromiumOS 607 // The download shelf view (view at the bottom of the page). ChromiumOS
609 // uses ActiveDownloadsUI instead. 608 // uses ActiveDownloadsUI instead.
610 scoped_ptr<DownloadShelfView> download_shelf_; 609 scoped_ptr<DownloadShelfView> download_shelf_;
611 #endif 610 #endif
612 611
613 // The InfoBarContainerView that contains InfoBars for the current tab. 612 // The InfoBarContainerView that contains InfoBars for the current tab.
614 InfoBarContainerView* infobar_container_; 613 InfoBarContainerView* infobar_container_;
615 614
616 // The view that contains the selected TabContents. 615 // The view that contains the selected TabContents.
617 views::WebView* contents_container_; 616 TabContentsContainer* contents_container_;
618 617
619 // The view that contains devtools window for the selected TabContents. 618 // The view that contains devtools window for the selected TabContents.
620 TabContentsContainer* devtools_container_; 619 TabContentsContainer* devtools_container_;
621 620
622 // The view that contains instant's TabContents. 621 // The view that contains instant's TabContents.
623 views::WebView* preview_container_; 622 TabContentsContainer* preview_container_;
624 623
625 // The view managing both the contents_container_ and preview_container_. 624 // The view managing both the contents_container_ and preview_container_.
626 ContentsContainer* contents_; 625 ContentsContainer* contents_;
627 626
628 // Split view containing the contents container and devtools container. 627 // Split view containing the contents container and devtools container.
629 views::SingleSplitView* contents_split_; 628 views::SingleSplitView* contents_split_;
630 629
631 // Side to dock devtools to 630 // Side to dock devtools to
632 DevToolsDockSide devtools_dock_side_; 631 DevToolsDockSide devtools_dock_side_;
633 632
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
691 PendingFullscreenRequest fullscreen_request_; 690 PendingFullscreenRequest fullscreen_request_;
692 691
693 BrowserWindowMoveObserver* move_observer_; 692 BrowserWindowMoveObserver* move_observer_;
694 693
695 gfx::ScopedSysColorChangeListener color_change_listener_; 694 gfx::ScopedSysColorChangeListener color_change_listener_;
696 695
697 DISALLOW_COPY_AND_ASSIGN(BrowserView); 696 DISALLOW_COPY_AND_ASSIGN(BrowserView);
698 }; 697 };
699 698
700 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 699 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/find_bar_host_interactive_uitest.cc ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698