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

Side by Side Diff: chrome/browser/ui/browser.h

Issue 6973035: Move download stuff to download tab helper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Oops, forgot to add tab watcher as delegate with CF. Created 9 years, 7 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/instant/instant_loader.cc ('k') | chrome/browser/ui/browser.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_BROWSER_H_ 5 #ifndef CHROME_BROWSER_UI_BROWSER_H_
6 #define CHROME_BROWSER_UI_BROWSER_H_ 6 #define CHROME_BROWSER_UI_BROWSER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 13 matching lines...) Expand all
24 #include "chrome/browser/prefs/pref_change_registrar.h" 24 #include "chrome/browser/prefs/pref_change_registrar.h"
25 #include "chrome/browser/sessions/session_id.h" 25 #include "chrome/browser/sessions/session_id.h"
26 #include "chrome/browser/sessions/tab_restore_service_observer.h" 26 #include "chrome/browser/sessions/tab_restore_service_observer.h"
27 #include "chrome/browser/sync/profile_sync_service_observer.h" 27 #include "chrome/browser/sync/profile_sync_service_observer.h"
28 #include "chrome/browser/tabs/tab_handler.h" 28 #include "chrome/browser/tabs/tab_handler.h"
29 #include "chrome/browser/tabs/tab_strip_model_delegate.h" // TODO(beng): remove 29 #include "chrome/browser/tabs/tab_strip_model_delegate.h" // TODO(beng): remove
30 #include "chrome/browser/tabs/tab_strip_model_observer.h" // TODO(beng): remove 30 #include "chrome/browser/tabs/tab_strip_model_observer.h" // TODO(beng): remove
31 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate. h" 31 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate. h"
32 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h" 32 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h"
33 #include "chrome/browser/ui/browser_navigator.h" 33 #include "chrome/browser/ui/browser_navigator.h"
34 #include "chrome/browser/ui/download/download_tab_helper_delegate.h"
34 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h" 35 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h"
35 #include "chrome/browser/ui/shell_dialogs.h" 36 #include "chrome/browser/ui/shell_dialogs.h"
36 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper_delegate.h" 37 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper_delegate.h"
37 #include "chrome/browser/ui/toolbar/toolbar_model.h" 38 #include "chrome/browser/ui/toolbar/toolbar_model.h"
38 #include "chrome/common/content_settings_types.h" 39 #include "chrome/common/content_settings_types.h"
39 #include "chrome/common/extensions/extension_constants.h" 40 #include "chrome/common/extensions/extension_constants.h"
40 #include "content/browser/tab_contents/page_navigator.h" 41 #include "content/browser/tab_contents/page_navigator.h"
41 #include "content/browser/tab_contents/tab_contents_delegate.h" 42 #include "content/browser/tab_contents/tab_contents_delegate.h"
42 #include "content/common/notification_registrar.h" 43 #include "content/common/notification_registrar.h"
43 #include "content/common/page_transition_types.h" 44 #include "content/common/page_transition_types.h"
(...skipping 17 matching lines...) Expand all
61 namespace gfx { 62 namespace gfx {
62 class Point; 63 class Point;
63 } 64 }
64 65
65 class Browser : public TabHandlerDelegate, 66 class Browser : public TabHandlerDelegate,
66 public TabContentsDelegate, 67 public TabContentsDelegate,
67 public TabContentsWrapperDelegate, 68 public TabContentsWrapperDelegate,
68 public SearchEngineTabHelperDelegate, 69 public SearchEngineTabHelperDelegate,
69 public BlockedContentTabHelperDelegate, 70 public BlockedContentTabHelperDelegate,
70 public BookmarkTabHelperDelegate, 71 public BookmarkTabHelperDelegate,
72 public DownloadTabHelperDelegate,
71 public PageNavigator, 73 public PageNavigator,
72 public CommandUpdater::CommandUpdaterDelegate, 74 public CommandUpdater::CommandUpdaterDelegate,
73 public NotificationObserver, 75 public NotificationObserver,
74 public SelectFileDialog::Listener, 76 public SelectFileDialog::Listener,
75 public TabRestoreServiceObserver, 77 public TabRestoreServiceObserver,
76 public ProfileSyncServiceObserver, 78 public ProfileSyncServiceObserver,
77 public InstantDelegate { 79 public InstantDelegate {
78 public: 80 public:
79 // SessionService::WindowType mirrors these values. If you add to this 81 // SessionService::WindowType mirrors these values. If you add to this
80 // enum, look at SessionService::WindowType to see if it needs to be 82 // enum, look at SessionService::WindowType to see if it needs to be
(...skipping 723 matching lines...) Expand 10 before | Expand all | Expand 10 after
804 virtual bool TakeFocus(bool reverse); 806 virtual bool TakeFocus(bool reverse);
805 virtual bool IsApplication() const; 807 virtual bool IsApplication() const;
806 virtual void ConvertContentsToApplication(TabContents* source); 808 virtual void ConvertContentsToApplication(TabContents* source);
807 virtual bool ShouldDisplayURLField(); 809 virtual bool ShouldDisplayURLField();
808 virtual void BeforeUnloadFired(TabContents* source, 810 virtual void BeforeUnloadFired(TabContents* source,
809 bool proceed, 811 bool proceed,
810 bool* proceed_to_fire_unload); 812 bool* proceed_to_fire_unload);
811 virtual void SetFocusToLocationBar(bool select_all); 813 virtual void SetFocusToLocationBar(bool select_all);
812 virtual void RenderWidgetShowing(); 814 virtual void RenderWidgetShowing();
813 virtual int GetExtraRenderViewHeight() const; 815 virtual int GetExtraRenderViewHeight() const;
814 virtual void OnStartDownload(DownloadItem* download, TabContents* tab);
815 virtual void ShowPageInfo(Profile* profile, 816 virtual void ShowPageInfo(Profile* profile,
816 const GURL& url, 817 const GURL& url,
817 const NavigationEntry::SSLStatus& ssl, 818 const NavigationEntry::SSLStatus& ssl,
818 bool show_history); 819 bool show_history);
819 virtual void ViewSourceForTab(TabContents* source, const GURL& page_url); 820 virtual void ViewSourceForTab(TabContents* source, const GURL& page_url);
820 virtual void ViewSourceForFrame(TabContents* source, 821 virtual void ViewSourceForFrame(TabContents* source,
821 const GURL& frame_url, 822 const GURL& frame_url,
822 const std::string& frame_content_state); 823 const std::string& frame_content_state);
823 virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, 824 virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
824 bool* is_keyboard_shortcut); 825 bool* is_keyboard_shortcut);
(...skipping 26 matching lines...) Expand all
851 Profile* profile) OVERRIDE; 852 Profile* profile) OVERRIDE;
852 853
853 // Overridden from BlockedContentTabHelperDelegate: 854 // Overridden from BlockedContentTabHelperDelegate:
854 virtual TabContentsWrapper* GetConstrainingContentsWrapper( 855 virtual TabContentsWrapper* GetConstrainingContentsWrapper(
855 TabContentsWrapper* source) OVERRIDE; 856 TabContentsWrapper* source) OVERRIDE;
856 857
857 // Overridden from BookmarkTabHelperDelegate: 858 // Overridden from BookmarkTabHelperDelegate:
858 virtual void URLStarredChanged(TabContentsWrapper* source, 859 virtual void URLStarredChanged(TabContentsWrapper* source,
859 bool starred) OVERRIDE; 860 bool starred) OVERRIDE;
860 861
862 // Overridden from DownloadTabHelperDelegate:
863 virtual bool CanDownload(int request_id) OVERRIDE;
864 virtual void OnStartDownload(DownloadItem* download,
865 TabContentsWrapper* tab) OVERRIDE;
866
867
861 // Overridden from SelectFileDialog::Listener: 868 // Overridden from SelectFileDialog::Listener:
862 virtual void FileSelected(const FilePath& path, int index, void* params); 869 virtual void FileSelected(const FilePath& path, int index, void* params);
863 870
864 // Overridden from NotificationObserver: 871 // Overridden from NotificationObserver:
865 virtual void Observe(NotificationType type, 872 virtual void Observe(NotificationType type,
866 const NotificationSource& source, 873 const NotificationSource& source,
867 const NotificationDetails& details); 874 const NotificationDetails& details);
868 875
869 // Overridden from ProfileSyncServiceObserver: 876 // Overridden from ProfileSyncServiceObserver:
870 virtual void OnStateChanged(); 877 virtual void OnStateChanged();
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
1208 // Helper which implements the TabRestoreServiceDelegate interface. 1215 // Helper which implements the TabRestoreServiceDelegate interface.
1209 scoped_ptr<BrowserTabRestoreServiceDelegate> tab_restore_service_delegate_; 1216 scoped_ptr<BrowserTabRestoreServiceDelegate> tab_restore_service_delegate_;
1210 1217
1211 scoped_ptr<InstantController> instant_; 1218 scoped_ptr<InstantController> instant_;
1212 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; 1219 scoped_ptr<InstantUnloadHandler> instant_unload_handler_;
1213 1220
1214 DISALLOW_COPY_AND_ASSIGN(Browser); 1221 DISALLOW_COPY_AND_ASSIGN(Browser);
1215 }; 1222 };
1216 1223
1217 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1224 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « chrome/browser/instant/instant_loader.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698