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

Side by Side Diff: chrome/browser/gtk/browser_window_gtk.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/download/save_page_uitest.cc ('k') | chrome/browser/gtk/browser_window_gtk.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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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_GTK_BROWSER_WINDOW_GTK_H_ 5 #ifndef CHROME_BROWSER_GTK_BROWSER_WINDOW_GTK_H_
6 #define CHROME_BROWSER_GTK_BROWSER_WINDOW_GTK_H_ 6 #define CHROME_BROWSER_GTK_BROWSER_WINDOW_GTK_H_
7 7
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 9
10 #include "base/gfx/rect.h" 10 #include "base/gfx/rect.h"
11 #include "base/scoped_ptr.h" 11 #include "base/scoped_ptr.h"
12 #include "base/timer.h" 12 #include "base/timer.h"
13 #include "chrome/browser/browser_window.h" 13 #include "chrome/browser/browser_window.h"
14 #include "chrome/browser/tabs/tab_strip_model.h" 14 #include "chrome/browser/tabs/tab_strip_model.h"
15 #include "chrome/common/notification_registrar.h" 15 #include "chrome/common/notification_registrar.h"
16 16
17 class BookmarkBarGtk; 17 class BookmarkBarGtk;
18 class BrowserToolbarGtk; 18 class BrowserToolbarGtk;
19 class DownloadShelfGtk;
19 class FindBarGtk; 20 class FindBarGtk;
20 class InfoBarContainerGtk; 21 class InfoBarContainerGtk;
21 class LocationBar; 22 class LocationBar;
22 class NineBox; 23 class NineBox;
23 class StatusBubbleGtk; 24 class StatusBubbleGtk;
24 class TabContentsContainerGtk; 25 class TabContentsContainerGtk;
25 class TabStripGtk; 26 class TabStripGtk;
26 27
27 // An implementation of BrowserWindow for GTK. 28 // An implementation of BrowserWindow for GTK.
28 // Cross-platform code will interact with this object when 29 // Cross-platform code will interact with this object when
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 virtual void UpdateStopGoState(bool is_loading, bool force); 62 virtual void UpdateStopGoState(bool is_loading, bool force);
62 virtual void UpdateToolbar(TabContents* contents, 63 virtual void UpdateToolbar(TabContents* contents,
63 bool should_restore_state); 64 bool should_restore_state);
64 virtual void FocusToolbar(); 65 virtual void FocusToolbar();
65 virtual bool IsBookmarkBarVisible() const; 66 virtual bool IsBookmarkBarVisible() const;
66 virtual gfx::Rect GetRootWindowResizerRect() const; 67 virtual gfx::Rect GetRootWindowResizerRect() const;
67 virtual void ToggleBookmarkBar(); 68 virtual void ToggleBookmarkBar();
68 virtual void ShowAboutChromeDialog(); 69 virtual void ShowAboutChromeDialog();
69 virtual void ShowBookmarkManager(); 70 virtual void ShowBookmarkManager();
70 virtual void ShowBookmarkBubble(const GURL& url, bool already_bookmarked); 71 virtual void ShowBookmarkBubble(const GURL& url, bool already_bookmarked);
72 virtual bool IsDownloadShelfVisible() const;
73 virtual DownloadShelf* GetDownloadShelf();
71 virtual void ShowReportBugDialog(); 74 virtual void ShowReportBugDialog();
72 virtual void ShowClearBrowsingDataDialog(); 75 virtual void ShowClearBrowsingDataDialog();
73 virtual void ShowImportDialog(); 76 virtual void ShowImportDialog();
74 virtual void ShowSearchEnginesDialog(); 77 virtual void ShowSearchEnginesDialog();
75 virtual void ShowPasswordManager(); 78 virtual void ShowPasswordManager();
76 virtual void ShowSelectProfileDialog(); 79 virtual void ShowSelectProfileDialog();
77 virtual void ShowNewProfileDialog(); 80 virtual void ShowNewProfileDialog();
78 virtual void ConfirmBrowserCloseWithPendingDownloads(); 81 virtual void ConfirmBrowserCloseWithPendingDownloads();
79 virtual void ShowHTMLDialog(HtmlDialogUIDelegate* delegate, 82 virtual void ShowHTMLDialog(HtmlDialogUIDelegate* delegate,
80 gfx::NativeWindow parent_window); 83 gfx::NativeWindow parent_window);
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 GtkWindow* window_; 118 GtkWindow* window_;
116 // VBox that holds the interior components of the chromium window. 119 // VBox that holds the interior components of the chromium window.
117 GtkWidget* window_vbox_; 120 GtkWidget* window_vbox_;
118 // VBox that holds everything below the tabs. 121 // VBox that holds everything below the tabs.
119 GtkWidget* content_vbox_; 122 GtkWidget* content_vbox_;
120 // VBox that holds everything below the toolbar. 123 // VBox that holds everything below the toolbar.
121 GtkWidget* render_area_vbox_; 124 GtkWidget* render_area_vbox_;
122 125
123 scoped_ptr<Browser> browser_; 126 scoped_ptr<Browser> browser_;
124 127
128 // The download shelf view (view at the bottom of the page).
129 scoped_ptr<DownloadShelfGtk> download_shelf_;
130
125 private: 131 private:
126 // Sets the default size for the window and the the way the user is allowed to 132 // Sets the default size for the window and the the way the user is allowed to
127 // resize it. 133 // resize it.
128 void SetGeometryHints(); 134 void SetGeometryHints();
129 135
130 // Set up the window icon (potentially used in window border or alt-tab list). 136 // Set up the window icon (potentially used in window border or alt-tab list).
131 void SetWindowIcon(); 137 void SetWindowIcon();
132 138
133 // Connect accelerators that aren't connected to menu items (like ctrl-o, 139 // Connect accelerators that aren't connected to menu items (like ctrl-o,
134 // ctrl-l, etc.). 140 // ctrl-l, etc.).
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 // The container for info bars. Always non-NULL. 208 // The container for info bars. Always non-NULL.
203 scoped_ptr<InfoBarContainerGtk> infobar_container_; 209 scoped_ptr<InfoBarContainerGtk> infobar_container_;
204 210
205 // The timer used to update frames for the Loading Animation. 211 // The timer used to update frames for the Loading Animation.
206 base::RepeatingTimer<BrowserWindowGtk> loading_animation_timer_; 212 base::RepeatingTimer<BrowserWindowGtk> loading_animation_timer_;
207 213
208 DISALLOW_COPY_AND_ASSIGN(BrowserWindowGtk); 214 DISALLOW_COPY_AND_ASSIGN(BrowserWindowGtk);
209 }; 215 };
210 216
211 #endif // CHROME_BROWSER_GTK_BROWSER_WINDOW_GTK_H_ 217 #endif // CHROME_BROWSER_GTK_BROWSER_WINDOW_GTK_H_
OLDNEW
« no previous file with comments | « chrome/browser/download/save_page_uitest.cc ('k') | chrome/browser/gtk/browser_window_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698