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

Unified Diff: chrome/browser/ui/tab_contents/tab_contents_wrapper.h

Issue 6680002: Pull the file picker code out of TabContents. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes for jam@ Created 9 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/file_select_helper.cc ('k') | chrome/browser/ui/tab_contents/tab_contents_wrapper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/tab_contents/tab_contents_wrapper.h
diff --git a/chrome/browser/ui/tab_contents/tab_contents_wrapper.h b/chrome/browser/ui/tab_contents/tab_contents_wrapper.h
index 0c075aa3d50ba100b3198b7aae66e15b2ce04a38..4baec54a904c2b79ab8b8bbc98f3df7c91fd99a4 100644
--- a/chrome/browser/ui/tab_contents/tab_contents_wrapper.h
+++ b/chrome/browser/ui/tab_contents/tab_contents_wrapper.h
@@ -18,6 +18,7 @@ class PrerenderObserver;
}
class Extension;
+class FileSelectObserver;
class FindTabHelper;
class NavigationController;
class PasswordManager;
@@ -134,6 +135,8 @@ class TabContentsWrapper : public NotificationObserver,
bool is_starred_;
// Tab Helpers ---------------------------------------------------------------
+ // (These provide API for callers and have a getter function listed in the
+ // "Tab Helpers" section in the member functions area, above.)
scoped_ptr<FindTabHelper> find_tab_helper_;
@@ -142,10 +145,15 @@ class TabContentsWrapper : public NotificationObserver,
scoped_ptr<PasswordManagerDelegate> password_manager_delegate_;
scoped_ptr<PasswordManager> password_manager_;
- scoped_ptr<prerender::PrerenderObserver> prerender_observer_;
-
scoped_ptr<SearchEngineTabHelper> search_engine_tab_helper_;
+ // Per-tab observers ---------------------------------------------------------
+ // (These provide no API for callers; objects that need to exist 1:1 with tabs
+ // and silently do their thing live here.)
+
+ scoped_ptr<FileSelectObserver> file_select_observer_;
+ scoped_ptr<prerender::PrerenderObserver> prerender_observer_;
+
// TabContents (MUST BE LAST) ------------------------------------------------
// The supporting objects need to outlive the TabContents dtor (as they may
« no previous file with comments | « chrome/browser/file_select_helper.cc ('k') | chrome/browser/ui/tab_contents/tab_contents_wrapper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698