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

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

Issue 1704793002: Remove kDisableDownloadNotification and stop compiling shelf code on (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 10 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
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 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 #include "chrome/browser/hang_monitor/hung_window_detector.h" 46 #include "chrome/browser/hang_monitor/hung_window_detector.h"
47 #endif 47 #endif
48 48
49 // NOTE: For more information about the objects and files in this directory, 49 // NOTE: For more information about the objects and files in this directory,
50 // view: http://dev.chromium.org/developers/design-documents/browser-window 50 // view: http://dev.chromium.org/developers/design-documents/browser-window
51 51
52 class BookmarkBarView; 52 class BookmarkBarView;
53 class Browser; 53 class Browser;
54 class BrowserViewLayout; 54 class BrowserViewLayout;
55 class ContentsLayoutManager; 55 class ContentsLayoutManager;
56 class DownloadShelfView;
57 class ExclusiveAccessBubbleViews; 56 class ExclusiveAccessBubbleViews;
58 class InfoBarContainerView; 57 class InfoBarContainerView;
59 class LocationBarView; 58 class LocationBarView;
60 class StatusBubbleViews; 59 class StatusBubbleViews;
61 class TabStrip; 60 class TabStrip;
62 class ToolbarView; 61 class ToolbarView;
63 class TopContainerView; 62 class TopContainerView;
64 class WebContentsCloseHandler; 63 class WebContentsCloseHandler;
65 64
66 #if defined(OS_WIN) 65 #if defined(OS_WIN)
67 class JumpList; 66 class JumpList;
68 #endif 67 #endif
69 68
69 #if !defined(OS_CHROMEOS)
70 class DownloadShelfView;
71 #endif
72
70 namespace extensions { 73 namespace extensions {
71 class ActiveTabPermissionGranter; 74 class ActiveTabPermissionGranter;
72 class Command; 75 class Command;
73 class Extension; 76 class Extension;
74 } 77 }
75 78
76 namespace views { 79 namespace views {
77 class AccessiblePaneView; 80 class AccessiblePaneView;
78 class ExternalFocusTracker; 81 class ExternalFocusTracker;
79 class WebView; 82 class WebView;
(...skipping 560 matching lines...) Expand 10 before | Expand all | Expand 10 after
640 643
641 // The Bookmark Bar View for this window. Lazily created. May be null for 644 // The Bookmark Bar View for this window. Lazily created. May be null for
642 // non-tabbed browsers like popups. May not be visible. 645 // non-tabbed browsers like popups. May not be visible.
643 scoped_ptr<BookmarkBarView> bookmark_bar_view_; 646 scoped_ptr<BookmarkBarView> bookmark_bar_view_;
644 647
645 // The do-nothing view which controls the z-order of the find bar widget 648 // The do-nothing view which controls the z-order of the find bar widget
646 // relative to views which paint into layers and views with an associated 649 // relative to views which paint into layers and views with an associated
647 // NativeView. 650 // NativeView.
648 View* find_bar_host_view_; 651 View* find_bar_host_view_;
649 652
653 #if defined(OS_CHROMEOS)
654 scoped_ptr<views::View> download_shelf_;
655 #else
650 // The download shelf view (view at the bottom of the page). 656 // The download shelf view (view at the bottom of the page).
651 scoped_ptr<DownloadShelfView> download_shelf_; 657 scoped_ptr<DownloadShelfView> download_shelf_;
658 #endif
652 659
653 // The InfoBarContainerView that contains InfoBars for the current tab. 660 // The InfoBarContainerView that contains InfoBars for the current tab.
654 InfoBarContainerView* infobar_container_; 661 InfoBarContainerView* infobar_container_;
655 662
656 // The view that contains the selected WebContents. 663 // The view that contains the selected WebContents.
657 ContentsWebView* contents_web_view_; 664 ContentsWebView* contents_web_view_;
658 665
659 // The view that contains devtools window for the selected WebContents. 666 // The view that contains devtools window for the selected WebContents.
660 views::WebView* devtools_web_view_; 667 views::WebView* devtools_web_view_;
661 668
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
729 736
730 // The class that registers for keyboard shortcuts for extension commands. 737 // The class that registers for keyboard shortcuts for extension commands.
731 scoped_ptr<ExtensionKeybindingRegistryViews> extension_keybinding_registry_; 738 scoped_ptr<ExtensionKeybindingRegistryViews> extension_keybinding_registry_;
732 739
733 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; 740 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_;
734 741
735 DISALLOW_COPY_AND_ASSIGN(BrowserView); 742 DISALLOW_COPY_AND_ASSIGN(BrowserView);
736 }; 743 };
737 744
738 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 745 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698