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

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

Issue 115740: Move download shelf from per-tab to per-window (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 11 years, 6 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
« no previous file with comments | « chrome/browser/views/download_shelf_view.cc ('k') | chrome/browser/views/frame/browser_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 10 matching lines...) Expand all
21 #include "chrome/browser/hang_monitor/hung_window_detector.h" 21 #include "chrome/browser/hang_monitor/hung_window_detector.h"
22 #endif 22 #endif
23 23
24 // NOTE: For more information about the objects and files in this directory, 24 // NOTE: For more information about the objects and files in this directory,
25 // view: http://dev.chromium.org/developers/design-documents/browser-window 25 // view: http://dev.chromium.org/developers/design-documents/browser-window
26 26
27 class BookmarkBarView; 27 class BookmarkBarView;
28 class Browser; 28 class Browser;
29 class BrowserBubble; 29 class BrowserBubble;
30 class BrowserToolbarView; 30 class BrowserToolbarView;
31 class DownloadShelfView;
31 class EncodingMenuControllerDelegate; 32 class EncodingMenuControllerDelegate;
32 class ExtensionShelf; 33 class ExtensionShelf;
33 class FullscreenExitBubble; 34 class FullscreenExitBubble;
34 class HtmlDialogUIDelegate; 35 class HtmlDialogUIDelegate;
35 class InfoBarContainer; 36 class InfoBarContainer;
36 class StatusBubbleViews; 37 class StatusBubbleViews;
37 class TabContentsContainer; 38 class TabContentsContainer;
38 class TabStrip; 39 class TabStrip;
39 40
40 namespace views { 41 namespace views {
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 virtual void UpdateToolbar(TabContents* contents, bool should_restore_state); 209 virtual void UpdateToolbar(TabContents* contents, bool should_restore_state);
209 virtual void FocusToolbar(); 210 virtual void FocusToolbar();
210 virtual void DestroyBrowser(); 211 virtual void DestroyBrowser();
211 virtual bool IsBookmarkBarVisible() const; 212 virtual bool IsBookmarkBarVisible() const;
212 virtual gfx::Rect GetRootWindowResizerRect() const; 213 virtual gfx::Rect GetRootWindowResizerRect() const;
213 virtual void DisableInactiveFrame(); 214 virtual void DisableInactiveFrame();
214 virtual void ToggleBookmarkBar(); 215 virtual void ToggleBookmarkBar();
215 virtual void ShowAboutChromeDialog(); 216 virtual void ShowAboutChromeDialog();
216 virtual void ShowBookmarkManager(); 217 virtual void ShowBookmarkManager();
217 virtual void ShowBookmarkBubble(const GURL& url, bool already_bookmarked); 218 virtual void ShowBookmarkBubble(const GURL& url, bool already_bookmarked);
219 virtual void SetDownloadShelfVisible(bool visible);
220 virtual bool IsDownloadShelfVisible() const;
221 virtual DownloadShelf* GetDownloadShelf();
218 virtual void ShowReportBugDialog(); 222 virtual void ShowReportBugDialog();
219 virtual void ShowClearBrowsingDataDialog(); 223 virtual void ShowClearBrowsingDataDialog();
220 virtual void ShowImportDialog(); 224 virtual void ShowImportDialog();
221 virtual void ShowSearchEnginesDialog(); 225 virtual void ShowSearchEnginesDialog();
222 virtual void ShowPasswordManager(); 226 virtual void ShowPasswordManager();
223 virtual void ShowSelectProfileDialog(); 227 virtual void ShowSelectProfileDialog();
224 virtual void ShowNewProfileDialog(); 228 virtual void ShowNewProfileDialog();
225 virtual void ConfirmBrowserCloseWithPendingDownloads(); 229 virtual void ConfirmBrowserCloseWithPendingDownloads();
226 virtual void ShowHTMLDialog(HtmlDialogUIDelegate* delegate, 230 virtual void ShowHTMLDialog(HtmlDialogUIDelegate* delegate,
227 gfx::NativeWindow parent_window); 231 gfx::NativeWindow parent_window);
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 // Browser type) and there should be a subsequent re-layout to show it. 314 // Browser type) and there should be a subsequent re-layout to show it.
311 // |contents| can be NULL. 315 // |contents| can be NULL.
312 bool MaybeShowBookmarkBar(TabContents* contents); 316 bool MaybeShowBookmarkBar(TabContents* contents);
313 317
314 // Prepare to show an Info Bar for the specified TabContents. Returns true 318 // Prepare to show an Info Bar for the specified TabContents. Returns true
315 // if there is an Info Bar to show and one is supported for this Browser 319 // if there is an Info Bar to show and one is supported for this Browser
316 // type, and there should be a subsequent re-layout to show it. 320 // type, and there should be a subsequent re-layout to show it.
317 // |contents| can be NULL. 321 // |contents| can be NULL.
318 bool MaybeShowInfoBar(TabContents* contents); 322 bool MaybeShowInfoBar(TabContents* contents);
319 323
320 // Prepare to show a Download Shelf for the specified TabContents. Returns
321 // true if there is a Download Shelf to show and one is supported for this
322 // Browser type, and there should be a subsequent re-layout to show it.
323 // |contents| can be NULL.
324 bool MaybeShowDownloadShelf(TabContents* contents);
325
326 // Updates various optional child Views, e.g. Bookmarks Bar, Info Bar or the 324 // Updates various optional child Views, e.g. Bookmarks Bar, Info Bar or the
327 // Download Shelf in response to a change notification from the specified 325 // Download Shelf in response to a change notification from the specified
328 // |contents|. |contents| can be NULL. In this case, all optional UI will be 326 // |contents|. |contents| can be NULL. In this case, all optional UI will be
329 // removed. 327 // removed.
330 void UpdateUIForContents(TabContents* contents); 328 void UpdateUIForContents(TabContents* contents);
331 329
332 // Updates an optional child View, e.g. Bookmarks Bar, Info Bar, Download 330 // Updates an optional child View, e.g. Bookmarks Bar, Info Bar, Download
333 // Shelf. If |*old_view| differs from new_view, the old_view is removed and 331 // Shelf. If |*old_view| differs from new_view, the old_view is removed and
334 // the new_view is added. This is intended to be used when swapping in/out 332 // the new_view is added. This is intended to be used when swapping in/out
335 // child views that are referenced via a field. 333 // child views that are referenced via a field.
(...skipping 22 matching lines...) Expand all
358 // The BrowserFrame that hosts this view. 356 // The BrowserFrame that hosts this view.
359 BrowserFrame* frame_; 357 BrowserFrame* frame_;
360 358
361 // The Browser object we are associated with. 359 // The Browser object we are associated with.
362 scoped_ptr<Browser> browser_; 360 scoped_ptr<Browser> browser_;
363 361
364 // Tool/Info bars that we are currently showing. Used for layout. 362 // Tool/Info bars that we are currently showing. Used for layout.
365 // active_bookmark_bar_ is either NULL, if the bookmark bar isn't showing, 363 // active_bookmark_bar_ is either NULL, if the bookmark bar isn't showing,
366 // or is bookmark_bar_view_ if the bookmark bar is showing. 364 // or is bookmark_bar_view_ if the bookmark bar is showing.
367 views::View* active_bookmark_bar_; 365 views::View* active_bookmark_bar_;
368 views::View* active_download_shelf_;
369 366
370 // The TabStrip. 367 // The TabStrip.
371 TabStrip* tabstrip_; 368 TabStrip* tabstrip_;
372 369
373 // The Toolbar containing the navigation buttons, menus and the address bar. 370 // The Toolbar containing the navigation buttons, menus and the address bar.
374 BrowserToolbarView* toolbar_; 371 BrowserToolbarView* toolbar_;
375 372
376 // The Bookmark Bar View for this window. Lazily created. 373 // The Bookmark Bar View for this window. Lazily created.
377 scoped_ptr<BookmarkBarView> bookmark_bar_view_; 374 scoped_ptr<BookmarkBarView> bookmark_bar_view_;
378 375
376 // The download shelf view (view at the bottom of the page).
377 DownloadShelfView* download_shelf_;
378
379 // The InfoBarContainer that contains InfoBars for the current tab. 379 // The InfoBarContainer that contains InfoBars for the current tab.
380 InfoBarContainer* infobar_container_; 380 InfoBarContainer* infobar_container_;
381 381
382 // The distance the FindBar is from the top of the window, in pixels. 382 // The distance the FindBar is from the top of the window, in pixels.
383 int find_bar_y_; 383 int find_bar_y_;
384 384
385 // The view that contains the selected TabContents. 385 // The view that contains the selected TabContents.
386 TabContentsContainer* contents_container_; 386 TabContentsContainer* contents_container_;
387 387
388 // The Status information bubble that appears at the bottom of the window. 388 // The Status information bubble that appears at the bottom of the window.
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 // A bottom bar for showing extensions. 433 // A bottom bar for showing extensions.
434 ExtensionShelf* extension_shelf_; 434 ExtensionShelf* extension_shelf_;
435 435
436 typedef std::set<BrowserBubble*> BubbleSet; 436 typedef std::set<BrowserBubble*> BubbleSet;
437 BubbleSet browser_bubbles_; 437 BubbleSet browser_bubbles_;
438 438
439 DISALLOW_COPY_AND_ASSIGN(BrowserView); 439 DISALLOW_COPY_AND_ASSIGN(BrowserView);
440 }; 440 };
441 441
442 #endif // CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_ 442 #endif // CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/views/download_shelf_view.cc ('k') | chrome/browser/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698