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

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

Issue 10831407: Kill PropertyBag, switch WebContents to SupportsUserData. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: works Created 8 years, 4 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_TAB_CONTENTS_TAB_CONTENTS_H_ 5 #ifndef CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_H_
6 #define CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_H_ 6 #define CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/property_bag.h"
13 #include "content/public/browser/web_contents_observer.h" 12 #include "content/public/browser/web_contents_observer.h"
14 13
15 class AlternateErrorPageTabObserver; 14 class AlternateErrorPageTabObserver;
16 class AutocompleteHistoryManager; 15 class AutocompleteHistoryManager;
17 class AutofillManager; 16 class AutofillManager;
18 class AutofillExternalDelegate; 17 class AutofillExternalDelegate;
19 class AutomationTabHelper; 18 class AutomationTabHelper;
20 class BlockedContentTabHelper; 19 class BlockedContentTabHelper;
21 class BookmarkTabHelper; 20 class BookmarkTabHelper;
22 class ConstrainedWindowTabHelper; 21 class ConstrainedWindowTabHelper;
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 return zoom_controller_.get(); 250 return zoom_controller_.get();
252 } 251 }
253 252
254 // Overrides ----------------------------------------------------------------- 253 // Overrides -----------------------------------------------------------------
255 254
256 // content::WebContentsObserver overrides: 255 // content::WebContentsObserver overrides:
257 virtual void WebContentsDestroyed(content::WebContents* tab) OVERRIDE; 256 virtual void WebContentsDestroyed(content::WebContents* tab) OVERRIDE;
258 virtual void UserAgentOverrideSet(const std::string& user_agent) OVERRIDE; 257 virtual void UserAgentOverrideSet(const std::string& user_agent) OVERRIDE;
259 258
260 private: 259 private:
261 // Used to retrieve this object from |web_contents_|, which is placed in
262 // its property bag to avoid adding additional interfaces.
263 static base::PropertyAccessor<TabContents*>* property_accessor();
264
265 // Tab Helpers --------------------------------------------------------------- 260 // Tab Helpers ---------------------------------------------------------------
266 // (These provide API for callers and have a getter function listed in the 261 // (These provide API for callers and have a getter function listed in the
267 // "Tab Helpers" section in the member functions area, above.) 262 // "Tab Helpers" section in the member functions area, above.)
268 263
269 scoped_ptr<AutocompleteHistoryManager> autocomplete_history_manager_; 264 scoped_ptr<AutocompleteHistoryManager> autocomplete_history_manager_;
270 scoped_refptr<AutofillManager> autofill_manager_; 265 scoped_refptr<AutofillManager> autofill_manager_;
271 scoped_ptr<AutofillExternalDelegate> autofill_external_delegate_; 266 scoped_ptr<AutofillExternalDelegate> autofill_external_delegate_;
272 scoped_ptr<AutomationTabHelper> automation_tab_helper_; 267 scoped_ptr<AutomationTabHelper> automation_tab_helper_;
273 scoped_ptr<BlockedContentTabHelper> blocked_content_tab_helper_; 268 scoped_ptr<BlockedContentTabHelper> blocked_content_tab_helper_;
274 scoped_ptr<BookmarkTabHelper> bookmark_tab_helper_; 269 scoped_ptr<BookmarkTabHelper> bookmark_tab_helper_;
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 338
344 // The supporting objects need to outlive the WebContents dtor (as they may 339 // The supporting objects need to outlive the WebContents dtor (as they may
345 // be called upon during its execution). As a result, this must come last 340 // be called upon during its execution). As a result, this must come last
346 // in the list. 341 // in the list.
347 scoped_ptr<content::WebContents> web_contents_; 342 scoped_ptr<content::WebContents> web_contents_;
348 343
349 DISALLOW_COPY_AND_ASSIGN(TabContents); 344 DISALLOW_COPY_AND_ASSIGN(TabContents);
350 }; 345 };
351 346
352 #endif // CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_H_ 347 #endif // CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698