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

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

Issue 172120: Revert "Revert "Allow DOMUI pages to call window.open(), giving DOMUI privileges to the new"" (Closed)
Patch Set: Created 11 years, 3 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
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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_TAB_CONTENTS_TAB_CONTENTS_H_ 5 #ifndef CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
6 #define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_ 6 #define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
7 7
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 9
10 #include <map> 10 #include <map>
11 #include <set> 11 #include <set>
12 #include <string> 12 #include <string>
13 #include <vector> 13 #include <vector>
14 14
15 #include "base/basictypes.h" 15 #include "base/basictypes.h"
16 #include "base/gfx/native_widget_types.h" 16 #include "base/gfx/native_widget_types.h"
17 #include "base/gfx/rect.h" 17 #include "base/gfx/rect.h"
18 #include "base/scoped_ptr.h" 18 #include "base/scoped_ptr.h"
19 #include "chrome/browser/autocomplete/autocomplete_edit.h" 19 #include "chrome/browser/autocomplete/autocomplete_edit.h"
20 #include "chrome/browser/cancelable_request.h" 20 #include "chrome/browser/cancelable_request.h"
21 #include "chrome/browser/dom_ui/dom_ui_factory.h"
21 #include "chrome/browser/download/save_package.h" 22 #include "chrome/browser/download/save_package.h"
22 #include "chrome/browser/fav_icon_helper.h" 23 #include "chrome/browser/fav_icon_helper.h"
23 #include "chrome/browser/find_notification_details.h" 24 #include "chrome/browser/find_notification_details.h"
24 #include "chrome/browser/shell_dialogs.h" 25 #include "chrome/browser/shell_dialogs.h"
25 #include "chrome/browser/renderer_host/render_view_host_delegate.h" 26 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
26 #include "chrome/browser/tab_contents/constrained_window.h" 27 #include "chrome/browser/tab_contents/constrained_window.h"
27 #include "chrome/browser/tab_contents/infobar_delegate.h" 28 #include "chrome/browser/tab_contents/infobar_delegate.h"
28 #include "chrome/browser/tab_contents/navigation_controller.h" 29 #include "chrome/browser/tab_contents/navigation_controller.h"
29 #include "chrome/browser/tab_contents/navigation_entry.h" 30 #include "chrome/browser/tab_contents/navigation_entry.h"
30 #include "chrome/browser/tab_contents/page_navigator.h" 31 #include "chrome/browser/tab_contents/page_navigator.h"
(...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after
583 } 584 }
584 585
585 BlockedPopupContainer* blocked_popup_container() const { 586 BlockedPopupContainer* blocked_popup_container() const {
586 return blocked_popups_; 587 return blocked_popups_;
587 } 588 }
588 589
589 RendererPreferences* GetMutableRendererPrefs() { 590 RendererPreferences* GetMutableRendererPrefs() {
590 return &renderer_preferences_; 591 return &renderer_preferences_;
591 } 592 }
592 593
594 void set_opener_dom_ui_type(DOMUITypeID opener_dom_ui_type) {
595 opener_dom_ui_type_ = opener_dom_ui_type;
596 }
597
593 private: 598 private:
594 friend class NavigationController; 599 friend class NavigationController;
595 // Used to access the child_windows_ (ConstrainedWindowList) for testing 600 // Used to access the child_windows_ (ConstrainedWindowList) for testing
596 // automation purposes. 601 // automation purposes.
597 friend class AutomationProvider; 602 friend class AutomationProvider;
598 friend class BlockedPopupContainerTest; 603 friend class BlockedPopupContainerTest;
599 friend class BlockedPopupContainerControllerTest; 604 friend class BlockedPopupContainerControllerTest;
600 605
601 FRIEND_TEST(BlockedPopupContainerTest, TestReposition); 606 FRIEND_TEST(BlockedPopupContainerTest, TestReposition);
602 FRIEND_TEST(TabContentsTest, NoJSMessageOnInterstitials); 607 FRIEND_TEST(TabContentsTest, NoJSMessageOnInterstitials);
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after
1105 // reset on navigations to false on navigations. 1110 // reset on navigations to false on navigations.
1106 bool suppress_javascript_messages_; 1111 bool suppress_javascript_messages_;
1107 1112
1108 // Shows an info-bar to users when they search from a known search engine and 1113 // Shows an info-bar to users when they search from a known search engine and
1109 // have never used the monibox for search before. 1114 // have never used the monibox for search before.
1110 scoped_ptr<OmniboxSearchHint> omnibox_search_hint_; 1115 scoped_ptr<OmniboxSearchHint> omnibox_search_hint_;
1111 1116
1112 // Settings that get passed to the renderer process. 1117 // Settings that get passed to the renderer process.
1113 RendererPreferences renderer_preferences_; 1118 RendererPreferences renderer_preferences_;
1114 1119
1120 // If this tab was created from a renderer using window.open, this will be
1121 // non-NULL and represent the DOMUI of the opening renderer.
1122 DOMUITypeID opener_dom_ui_type_;
1123
1115 // --------------------------------------------------------------------------- 1124 // ---------------------------------------------------------------------------
1116 1125
1117 DISALLOW_COPY_AND_ASSIGN(TabContents); 1126 DISALLOW_COPY_AND_ASSIGN(TabContents);
1118 }; 1127 };
1119 1128
1120 #endif // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_ 1129 #endif // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
OLDNEW
« no previous file with comments | « chrome/browser/tab_contents/render_view_host_manager.cc ('k') | chrome/browser/tab_contents/tab_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698