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

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

Issue 7880003: content: Move constrained window code from TabContents to TabContentsWrapper (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix mac regression now that shutdown timing was changed for views. Created 9 years, 2 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) 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>
11 11
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "chrome/browser/prefs/pref_change_registrar.h" 15 #include "chrome/browser/prefs/pref_change_registrar.h"
16 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper_synced_tab_delegat e.h" 16 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper_synced_tab_delegat e.h"
17 #include "content/browser/tab_contents/tab_contents.h" 17 #include "content/browser/tab_contents/tab_contents.h"
18 #include "content/browser/tab_contents/tab_contents_observer.h" 18 #include "content/browser/tab_contents/tab_contents_observer.h"
19 #include "content/common/notification_registrar.h" 19 #include "content/common/notification_registrar.h"
20 20
21 class AutocompleteHistoryManager; 21 class AutocompleteHistoryManager;
22 class AutofillManager; 22 class AutofillManager;
23 class AutomationTabHelper; 23 class AutomationTabHelper;
24 class BlockedContentTabHelper; 24 class BlockedContentTabHelper;
25 class BookmarkTabHelper; 25 class BookmarkTabHelper;
26 class ConstrainedWindowTabHelper;
26 class DownloadRequestLimiterObserver; 27 class DownloadRequestLimiterObserver;
27 class Extension; 28 class Extension;
28 class ExtensionTabHelper; 29 class ExtensionTabHelper;
29 class ExtensionWebNavigationTabObserver; 30 class ExtensionWebNavigationTabObserver;
30 class ExternalProtocolObserver; 31 class ExternalProtocolObserver;
31 class FaviconTabHelper; 32 class FaviconTabHelper;
32 class FileSelectObserver; 33 class FileSelectObserver;
33 class FindTabHelper; 34 class FindTabHelper;
34 class FirewallTraversalObserver; 35 class FirewallTraversalObserver;
35 class InfoBarTabHelper; 36 class InfoBarTabHelper;
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 165
165 const ExtensionTabHelper* extension_tab_helper() const { 166 const ExtensionTabHelper* extension_tab_helper() const {
166 return extension_tab_helper_.get(); 167 return extension_tab_helper_.get();
167 } 168 }
168 169
169 FaviconTabHelper* favicon_tab_helper() { return favicon_tab_helper_.get(); } 170 FaviconTabHelper* favicon_tab_helper() { return favicon_tab_helper_.get(); }
170 FindTabHelper* find_tab_helper() { return find_tab_helper_.get(); } 171 FindTabHelper* find_tab_helper() { return find_tab_helper_.get(); }
171 HistoryTabHelper* history_tab_helper() { return history_tab_helper_.get(); } 172 HistoryTabHelper* history_tab_helper() { return history_tab_helper_.get(); }
172 InfoBarTabHelper* infobar_tab_helper() { return infobar_tab_helper_.get(); } 173 InfoBarTabHelper* infobar_tab_helper() { return infobar_tab_helper_.get(); }
173 PasswordManager* password_manager() { return password_manager_.get(); } 174 PasswordManager* password_manager() { return password_manager_.get(); }
175 ConstrainedWindowTabHelper* constrained_window_tab_helper() {
176 return constrained_window_tab_helper_.get();
177 }
Avi (use Gerrit) 2011/09/28 00:16:50 Alphabetical, plz? Between BookmarkTabHelper and E
174 178
175 prerender::PrerenderTabHelper* prerender_tab_helper() { 179 prerender::PrerenderTabHelper* prerender_tab_helper() {
176 return prerender_tab_helper_.get(); 180 return prerender_tab_helper_.get();
177 } 181 }
178 182
179 printing::PrintViewManager* print_view_manager() { 183 printing::PrintViewManager* print_view_manager() {
180 return print_view_manager_.get(); 184 return print_view_manager_.get();
181 } 185 }
182 186
183 RestoreTabHelper* restore_tab_helper() { 187 RestoreTabHelper* restore_tab_helper() {
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 scoped_ptr<AutocompleteHistoryManager> autocomplete_history_manager_; 276 scoped_ptr<AutocompleteHistoryManager> autocomplete_history_manager_;
273 scoped_ptr<AutofillManager> autofill_manager_; 277 scoped_ptr<AutofillManager> autofill_manager_;
274 scoped_ptr<AutomationTabHelper> automation_tab_helper_; 278 scoped_ptr<AutomationTabHelper> automation_tab_helper_;
275 scoped_ptr<BlockedContentTabHelper> blocked_content_tab_helper_; 279 scoped_ptr<BlockedContentTabHelper> blocked_content_tab_helper_;
276 scoped_ptr<BookmarkTabHelper> bookmark_tab_helper_; 280 scoped_ptr<BookmarkTabHelper> bookmark_tab_helper_;
277 scoped_ptr<ExtensionTabHelper> extension_tab_helper_; 281 scoped_ptr<ExtensionTabHelper> extension_tab_helper_;
278 scoped_ptr<FaviconTabHelper> favicon_tab_helper_; 282 scoped_ptr<FaviconTabHelper> favicon_tab_helper_;
279 scoped_ptr<FindTabHelper> find_tab_helper_; 283 scoped_ptr<FindTabHelper> find_tab_helper_;
280 scoped_ptr<HistoryTabHelper> history_tab_helper_; 284 scoped_ptr<HistoryTabHelper> history_tab_helper_;
281 scoped_ptr<InfoBarTabHelper> infobar_tab_helper_; 285 scoped_ptr<InfoBarTabHelper> infobar_tab_helper_;
286 scoped_ptr<ConstrainedWindowTabHelper> constrained_window_tab_helper_;
Avi (use Gerrit) 2011/09/28 00:16:50 Alphabetical here too, plz.
282 287
283 // PasswordManager and its delegate. The delegate must outlive the manager, 288 // PasswordManager and its delegate. The delegate must outlive the manager,
284 // per documentation in password_manager.h. 289 // per documentation in password_manager.h.
285 scoped_ptr<PasswordManagerDelegate> password_manager_delegate_; 290 scoped_ptr<PasswordManagerDelegate> password_manager_delegate_;
286 scoped_ptr<PasswordManager> password_manager_; 291 scoped_ptr<PasswordManager> password_manager_;
287 292
288 scoped_ptr<prerender::PrerenderTabHelper> prerender_tab_helper_; 293 scoped_ptr<prerender::PrerenderTabHelper> prerender_tab_helper_;
289 294
290 // Handles print job for this contents. 295 // Handles print job for this contents.
291 scoped_ptr<printing::PrintViewManager> print_view_manager_; 296 scoped_ptr<printing::PrintViewManager> print_view_manager_;
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 332
328 // The supporting objects need to outlive the TabContents dtor (as they may 333 // The supporting objects need to outlive the TabContents dtor (as they may
329 // be called upon during its execution). As a result, this must come last 334 // be called upon during its execution). As a result, this must come last
330 // in the list. 335 // in the list.
331 scoped_ptr<TabContents> tab_contents_; 336 scoped_ptr<TabContents> tab_contents_;
332 337
333 DISALLOW_COPY_AND_ASSIGN(TabContentsWrapper); 338 DISALLOW_COPY_AND_ASSIGN(TabContentsWrapper);
334 }; 339 };
335 340
336 #endif // CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_ 341 #endif // CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698