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

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

Issue 7064033: Virtual destructors should have virtual keyword. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: 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/ui/gtk/tab_contents_drag_source.h ('k') | chrome/browser/ui/webui/history2_ui.h » ('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_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_ 5 #ifndef CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_
6 #define CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_ 6 #define CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 // and re-usable in other projects. 59 // and re-usable in other projects.
60 // TODO(pinkerton): Eventually, this class will become TabContents as far as 60 // TODO(pinkerton): Eventually, this class will become TabContents as far as
61 // the browser front-end is concerned, and the current TabContents will be 61 // the browser front-end is concerned, and the current TabContents will be
62 // renamed to something like WebPage or WebView (ben's suggestions). 62 // renamed to something like WebPage or WebView (ben's suggestions).
63 class TabContentsWrapper : public TabContentsObserver, 63 class TabContentsWrapper : public TabContentsObserver,
64 public NotificationObserver { 64 public NotificationObserver {
65 public: 65 public:
66 // Takes ownership of |contents|, which must be heap-allocated (as it lives 66 // Takes ownership of |contents|, which must be heap-allocated (as it lives
67 // in a scoped_ptr) and can not be NULL. 67 // in a scoped_ptr) and can not be NULL.
68 explicit TabContentsWrapper(TabContents* contents); 68 explicit TabContentsWrapper(TabContents* contents);
69 ~TabContentsWrapper(); 69 virtual ~TabContentsWrapper();
70 70
71 // Used to retrieve this object from |tab_contents_|, which is placed in 71 // Used to retrieve this object from |tab_contents_|, which is placed in
72 // its property bag to avoid adding additional interfaces. 72 // its property bag to avoid adding additional interfaces.
73 static PropertyAccessor<TabContentsWrapper*>* property_accessor(); 73 static PropertyAccessor<TabContentsWrapper*>* property_accessor();
74 74
75 static void RegisterUserPrefs(PrefService* prefs); 75 static void RegisterUserPrefs(PrefService* prefs);
76 76
77 // Initial title assigned to NavigationEntries from Navigate. 77 // Initial title assigned to NavigationEntries from Navigate.
78 static string16 GetDefaultTitle(); 78 static string16 GetDefaultTitle();
79 79
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 285
286 // The supporting objects need to outlive the TabContents dtor (as they may 286 // The supporting objects need to outlive the TabContents dtor (as they may
287 // be called upon during its execution). As a result, this must come last 287 // be called upon during its execution). As a result, this must come last
288 // in the list. 288 // in the list.
289 scoped_ptr<TabContents> tab_contents_; 289 scoped_ptr<TabContents> tab_contents_;
290 290
291 DISALLOW_COPY_AND_ASSIGN(TabContentsWrapper); 291 DISALLOW_COPY_AND_ASSIGN(TabContentsWrapper);
292 }; 292 };
293 293
294 #endif // CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_ 294 #endif // CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/tab_contents_drag_source.h ('k') | chrome/browser/ui/webui/history2_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698