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

Side by Side Diff: chrome/browser/cocoa/browser_window_cocoa.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/browser_window.h ('k') | chrome/browser/cocoa/browser_window_cocoa.mm » ('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_COCOA_BROWSER_WINDOW_COCOA_H_ 5 #ifndef CHROME_BROWSER_COCOA_BROWSER_WINDOW_COCOA_H_
6 #define CHROME_BROWSER_COCOA_BROWSER_WINDOW_COCOA_H_ 6 #define CHROME_BROWSER_COCOA_BROWSER_WINDOW_COCOA_H_
7 7
8 #include "chrome/browser/browser_window.h" 8 #include "chrome/browser/browser_window.h"
9 #include "chrome/browser/bookmarks/bookmark_model.h" 9 #include "chrome/browser/bookmarks/bookmark_model.h"
10 #include "chrome/common/notification_registrar.h" 10 #include "chrome/common/notification_registrar.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 virtual void UpdateStopGoState(bool is_loading, bool force); 50 virtual void UpdateStopGoState(bool is_loading, bool force);
51 virtual void UpdateToolbar(TabContents* contents, 51 virtual void UpdateToolbar(TabContents* contents,
52 bool should_restore_state); 52 bool should_restore_state);
53 virtual void FocusToolbar(); 53 virtual void FocusToolbar();
54 virtual bool IsBookmarkBarVisible() const; 54 virtual bool IsBookmarkBarVisible() const;
55 virtual gfx::Rect GetRootWindowResizerRect() const; 55 virtual gfx::Rect GetRootWindowResizerRect() const;
56 virtual void ToggleBookmarkBar(); 56 virtual void ToggleBookmarkBar();
57 virtual void ShowAboutChromeDialog(); 57 virtual void ShowAboutChromeDialog();
58 virtual void ShowBookmarkManager(); 58 virtual void ShowBookmarkManager();
59 virtual void ShowBookmarkBubble(const GURL& url, bool already_bookmarked); 59 virtual void ShowBookmarkBubble(const GURL& url, bool already_bookmarked);
60 virtual bool IsDownloadShelfVisible() const;
61 virtual DownloadShelf* GetDownloadShelf();
60 virtual void ShowReportBugDialog(); 62 virtual void ShowReportBugDialog();
61 virtual void ShowClearBrowsingDataDialog(); 63 virtual void ShowClearBrowsingDataDialog();
62 virtual void ShowImportDialog(); 64 virtual void ShowImportDialog();
63 virtual void ShowSearchEnginesDialog(); 65 virtual void ShowSearchEnginesDialog();
64 virtual void ShowPasswordManager(); 66 virtual void ShowPasswordManager();
65 virtual void ShowSelectProfileDialog(); 67 virtual void ShowSelectProfileDialog();
66 virtual void ShowNewProfileDialog(); 68 virtual void ShowNewProfileDialog();
67 virtual void ConfirmBrowserCloseWithPendingDownloads(); 69 virtual void ConfirmBrowserCloseWithPendingDownloads();
68 virtual void ShowHTMLDialog(HtmlDialogUIDelegate* delegate, 70 virtual void ShowHTMLDialog(HtmlDialogUIDelegate* delegate,
69 gfx::NativeWindow parent_window); 71 gfx::NativeWindow parent_window);
70 virtual void UserChangedTheme(); 72 virtual void UserChangedTheme();
71 virtual int GetExtraRenderViewHeight() const; 73 virtual int GetExtraRenderViewHeight() const;
72 74
73 // Overridden from NotificationObserver 75 // Overridden from NotificationObserver
74 virtual void Observe(NotificationType type, 76 virtual void Observe(NotificationType type,
75 const NotificationSource& source, 77 const NotificationSource& source,
76 const NotificationDetails& details); 78 const NotificationDetails& details);
77 79
78 // Adds the given FindBar cocoa controller to this browser window. 80 // Adds the given FindBar cocoa controller to this browser window.
79 void AddFindBar(FindBarCocoaController* find_bar_cocoa_controller); 81 void AddFindBar(FindBarCocoaController* find_bar_cocoa_controller);
80 82
81 protected: 83 protected:
82 virtual void DestroyBrowser(); 84 virtual void DestroyBrowser();
83 85
84 private: 86 private:
85 NotificationRegistrar registrar_; 87 NotificationRegistrar registrar_;
86 NSWindow* window_; // weak, owned by controller 88 NSWindow* window_; // weak, owned by controller
87 Browser* browser_; // weak, owned by controller 89 Browser* browser_; // weak, owned by controller
88 BrowserWindowController* controller_; // weak, owns us 90 BrowserWindowController* controller_; // weak, owns us
91
92 // Data for shelves and stuff ------------------------------------------------
93 // FIXME(thakis): This should probably in the controller on OS X.
94
95 // The download shelf view (view at the bottom of the page).
96 scoped_ptr<DownloadShelf> download_shelf_;
89 }; 97 };
90 98
91 #endif // CHROME_BROWSER_COCOA_BROWSER_WINDOW_COCOA_H_ 99 #endif // CHROME_BROWSER_COCOA_BROWSER_WINDOW_COCOA_H_
OLDNEW
« no previous file with comments | « chrome/browser/browser_window.h ('k') | chrome/browser/cocoa/browser_window_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698