diff options
24 files changed, 23 insertions, 43 deletions
diff --git a/chrome/browser/repost_form_warning_controller.cc b/chrome/browser/repost_form_warning_controller.cc index 10ed914..59d8dab 100644 --- a/chrome/browser/repost_form_warning_controller.cc +++ b/chrome/browser/repost_form_warning_controller.cc @@ -4,6 +4,7 @@ #include "chrome/browser/repost_form_warning_controller.h" +#include "chrome/browser/ui/constrained_window.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/common/notification_source.h" diff --git a/chrome/browser/repost_form_warning_controller.h b/chrome/browser/repost_form_warning_controller.h index d558f65..81f41d2 100644 --- a/chrome/browser/repost_form_warning_controller.h +++ b/chrome/browser/repost_form_warning_controller.h @@ -6,10 +6,10 @@ #define CHROME_BROWSER_REPOST_FORM_WARNING_CONTROLLER_H_ #pragma once -#include "content/browser/tab_contents/constrained_window.h" #include "content/common/notification_observer.h" #include "content/common/notification_registrar.h" +class ConstrainedWindow; class TabContents; // This class is used to continue or cancel a pending reload when the diff --git a/chrome/browser/ui/cocoa/constrained_window_mac.h b/chrome/browser/ui/cocoa/constrained_window_mac.h index 75c949a..d5ded4d 100644 --- a/chrome/browser/ui/cocoa/constrained_window_mac.h +++ b/chrome/browser/ui/cocoa/constrained_window_mac.h @@ -8,11 +8,10 @@ #import <Cocoa/Cocoa.h> -#include "content/browser/tab_contents/constrained_window.h" - #include "base/basictypes.h" #include "base/logging.h" #include "base/memory/scoped_nsobject.h" +#include "chrome/browser/ui/constrained_window.h" @class BrowserWindowController; @class GTMWindowSheetController; diff --git a/content/browser/tab_contents/constrained_window.h b/chrome/browser/ui/constrained_window.h index 1c79f34..77e13ac 100644 --- a/content/browser/tab_contents/constrained_window.h +++ b/chrome/browser/ui/constrained_window.h @@ -1,9 +1,9 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_BROWSER_TAB_CONTENTS_CONSTRAINED_WINDOW_H_ -#define CONTENT_BROWSER_TAB_CONTENTS_CONSTRAINED_WINDOW_H_ +#ifndef CHROME_BROWSER_UI_CONSTRAINED_WINDOW_H_ +#define CHROME_BROWSER_UI_CONSTRAINED_WINDOW_H_ #pragma once #include "build/build_config.h" @@ -11,8 +11,8 @@ /////////////////////////////////////////////////////////////////////////////// // ConstrainedWindow // -// This interface represents a window that is constrained to a TabContents' -// bounds. +// This interface represents a window that is constrained to a +// TabContentsView's bounds. // class ConstrainedWindow { public: @@ -30,4 +30,4 @@ class ConstrainedWindow { virtual ~ConstrainedWindow() {} }; -#endif // CONTENT_BROWSER_TAB_CONTENTS_CONSTRAINED_WINDOW_H_ +#endif // CHROME_BROWSER_UI_CONSTRAINED_WINDOW_H_ diff --git a/chrome/browser/ui/constrained_window_tab_helper.cc b/chrome/browser/ui/constrained_window_tab_helper.cc index b9d250a..2198930 100644 --- a/chrome/browser/ui/constrained_window_tab_helper.cc +++ b/chrome/browser/ui/constrained_window_tab_helper.cc @@ -4,6 +4,7 @@ #include "chrome/browser/ui/constrained_window_tab_helper.h" +#include "chrome/browser/ui/constrained_window.h" #include "chrome/browser/ui/constrained_window_tab_helper_delegate.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper_delegate.h" diff --git a/chrome/browser/ui/constrained_window_tab_helper_unittest.cc b/chrome/browser/ui/constrained_window_tab_helper_unittest.cc index 0c426d3..9931718 100644 --- a/chrome/browser/ui/constrained_window_tab_helper_unittest.cc +++ b/chrome/browser/ui/constrained_window_tab_helper_unittest.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/constrained_window.h" #include "chrome/browser/ui/constrained_window_tab_helper.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h" -#include "content/browser/tab_contents/constrained_window.h" #include "testing/gtest/include/gtest/gtest.h" #include "content/browser/browser_thread.h" diff --git a/chrome/browser/ui/gtk/constrained_window_gtk.h b/chrome/browser/ui/gtk/constrained_window_gtk.h index 5dbaa61..3716093 100644 --- a/chrome/browser/ui/gtk/constrained_window_gtk.h +++ b/chrome/browser/ui/gtk/constrained_window_gtk.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/task.h" -#include "content/browser/tab_contents/constrained_window.h" +#include "chrome/browser/ui/constrained_window.h" #include "ui/base/gtk/gtk_signal.h" #include "ui/base/gtk/owned_widget_gtk.h" diff --git a/chrome/browser/ui/login/login_prompt.cc b/chrome/browser/ui/login/login_prompt.cc index 786ee72..e5b1b4d 100644 --- a/chrome/browser/ui/login/login_prompt.cc +++ b/chrome/browser/ui/login/login_prompt.cc @@ -11,6 +11,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/password_manager/password_manager.h" #include "chrome/browser/tab_contents/tab_util.h" +#include "chrome/browser/ui/constrained_window.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_notification_types.h" #include "content/browser/browser_thread.h" @@ -19,7 +20,6 @@ #include "content/browser/renderer_host/render_view_host_delegate.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" -#include "content/browser/tab_contents/constrained_window.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/common/notification_service.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/views/collected_cookies_win.cc b/chrome/browser/ui/views/collected_cookies_win.cc index 325c705..6800649 100644 --- a/chrome/browser/ui/views/collected_cookies_win.cc +++ b/chrome/browser/ui/views/collected_cookies_win.cc @@ -10,6 +10,7 @@ #include "chrome/browser/infobars/infobar_tab_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/collected_cookies_infobar_delegate.h" +#include "chrome/browser/ui/constrained_window.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/views/constrained_window_views.h" #include "chrome/browser/ui/views/cookie_info_view.h" diff --git a/chrome/browser/ui/views/collected_cookies_win.h b/chrome/browser/ui/views/collected_cookies_win.h index 6a3202a..1169140 100644 --- a/chrome/browser/ui/views/collected_cookies_win.h +++ b/chrome/browser/ui/views/collected_cookies_win.h @@ -8,7 +8,6 @@ #include "base/compiler_specific.h" #include "chrome/common/content_settings.h" -#include "content/browser/tab_contents/constrained_window.h" #include "content/common/notification_observer.h" #include "content/common/notification_registrar.h" #include "views/controls/tabbed_pane/tabbed_pane_listener.h" diff --git a/chrome/browser/ui/views/constrained_window_views.h b/chrome/browser/ui/views/constrained_window_views.h index 8f84461..9c5fbc1 100644 --- a/chrome/browser/ui/views/constrained_window_views.h +++ b/chrome/browser/ui/views/constrained_window_views.h @@ -7,7 +7,7 @@ #pragma once #include "base/compiler_specific.h" -#include "content/browser/tab_contents/constrained_window.h" +#include "chrome/browser/ui/constrained_window.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" #include "views/widget/widget.h" diff --git a/chrome/browser/ui/views/default_search_view.h b/chrome/browser/ui/views/default_search_view.h index aaa96f2..d180724 100644 --- a/chrome/browser/ui/views/default_search_view.h +++ b/chrome/browser/ui/views/default_search_view.h @@ -9,13 +9,8 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/string16.h" -#include "content/browser/tab_contents/constrained_window.h" #include "views/window/dialog_delegate.h" -#if defined(TOOLKIT_USES_GTK) -#include "chrome/browser/ui/gtk/constrained_window_gtk.h" -#endif - class PrefService; class TabContents; class TemplateURL; diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector.h b/chrome/browser/ui/views/ssl_client_certificate_selector.h index 9082226..531c46e 100644 --- a/chrome/browser/ui/views/ssl_client_certificate_selector.h +++ b/chrome/browser/ui/views/ssl_client_certificate_selector.h @@ -13,7 +13,6 @@ #include "base/string16.h" #include "base/memory/ref_counted.h" #include "content/browser/ssl/ssl_client_auth_handler.h" -#include "content/browser/tab_contents/constrained_window.h" #include "ui/base/message_box_flags.h" #include "views/controls/button/button.h" #include "views/controls/table/table_view_observer.h" @@ -30,6 +29,7 @@ class TextButton; } class CertificateSelectorTableModel; +class ConstrainedWindow; class TabContentsWrapper; class SSLClientCertificateSelector : public SSLClientAuthObserver, diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc index 0a164b9..43b3399 100644 --- a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc +++ b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc @@ -7,6 +7,7 @@ #include <vector> #include "base/time.h" +#include "chrome/browser/ui/constrained_window.h" #include "chrome/browser/ui/constrained_window_tab_helper.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/views/sad_tab_view.h" diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 57d79bd..3b42f93 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -2789,6 +2789,7 @@ 'browser/ui/content_settings/content_setting_bubble_model.h', 'browser/ui/content_settings/content_setting_image_model.cc', 'browser/ui/content_settings/content_setting_image_model.h', + 'browser/ui/constrained_window.h', 'browser/ui/constrained_window_tab_helper.cc', 'browser/ui/constrained_window_tab_helper.h', 'browser/ui/constrained_window_tab_helper_delegate.cc', diff --git a/content/browser/renderer_host/render_view_host.h b/content/browser/renderer_host/render_view_host.h index 789db05..180f3ce 100644 --- a/content/browser/renderer_host/render_view_host.h +++ b/content/browser/renderer_host/render_view_host.h @@ -426,8 +426,7 @@ class CONTENT_EXPORT RenderViewHost : public RenderWidgetHost { // Sent to the renderer when a popup window should no longer count against // the current popup count (either because it's not a popup or because it was - // a generated by a user action or because a constrained popup got turned - // into a full window). + // a generated by a user action). void DisassociateFromPopupCount(); // Notification that a move or resize renderer's containing window has diff --git a/content/browser/renderer_host/render_widget_host.cc b/content/browser/renderer_host/render_widget_host.cc index 01077f7..b40f69c 100644 --- a/content/browser/renderer_host/render_widget_host.cc +++ b/content/browser/renderer_host/render_widget_host.cc @@ -258,11 +258,6 @@ void RenderWidgetHost::WasHidden() { content::CAUSE_FOR_GPU_LAUNCH_NO_LAUNCH, new GpuMsg_VisibilityChanged(routing_id_, process()->id(), false)); - // TODO(darin): what about constrained windows? it doesn't look like they - // see a message when their parent is hidden. maybe there is something more - // generic we can do at the TabContents API level instead of relying on - // Windows messages. - // Tell the RenderProcessHost we were hidden. process_->WidgetHidden(); diff --git a/content/browser/renderer_host/render_widget_host_view_win.cc b/content/browser/renderer_host/render_widget_host_view_win.cc index 63d233f..15beefb 100644 --- a/content/browser/renderer_host/render_widget_host_view_win.cc +++ b/content/browser/renderer_host/render_widget_host_view_win.cc @@ -294,11 +294,6 @@ void RenderWidgetHostViewWin::WasHidden() { // If we have a renderer, then inform it that we are being hidden so it can // reduce its resource utilization. render_widget_host_->WasHidden(); - - // TODO(darin): what about constrained windows? it doesn't look like they - // see a message when their parent is hidden. maybe there is something more - // generic we can do at the TabContents API level instead of relying on - // Windows messages. } void RenderWidgetHostViewWin::SetSize(const gfx::Size& size) { diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h index 6ae6bc9..635f7e0 100644 --- a/content/browser/tab_contents/tab_contents.h +++ b/content/browser/tab_contents/tab_contents.h @@ -18,7 +18,6 @@ #include "content/browser/download/save_package.h" #include "content/browser/javascript_dialogs.h" #include "content/browser/renderer_host/render_view_host_delegate.h" -#include "content/browser/tab_contents/constrained_window.h" #include "content/browser/tab_contents/navigation_controller.h" #include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/page_navigator.h" @@ -490,14 +489,10 @@ class CONTENT_EXPORT TabContents : public PageNavigator, private: friend class NavigationController; - // Used to access the child_windows_ (ConstrainedWindowList) for testing - // automation purposes. - friend class TestingAutomationProvider; FRIEND_TEST_ALL_PREFIXES(TabContentsTest, NoJSMessageOnInterstitials); FRIEND_TEST_ALL_PREFIXES(TabContentsTest, UpdateTitle); FRIEND_TEST_ALL_PREFIXES(TabContentsTest, CrossSiteCantPreemptAfterUnload); - FRIEND_TEST_ALL_PREFIXES(TabContentsTest, ConstrainedWindows); FRIEND_TEST_ALL_PREFIXES(FormStructureBrowserTest, HTMLFiles); FRIEND_TEST_ALL_PREFIXES(NavigationControllerTest, HistoryNavigate); FRIEND_TEST_ALL_PREFIXES(RenderViewHostManagerTest, PageDoesBackAndReload); diff --git a/content/common/view_messages.h b/content/common/view_messages.h index 2ba4123..e41e445 100644 --- a/content/common/view_messages.h +++ b/content/common/view_messages.h @@ -1133,8 +1133,7 @@ IPC_MESSAGE_CONTROL1(ViewMsg_PurgePluginListCache, // Sent to the renderer when a popup window should no longer count against // the current popup count (either because it's not a popup or because it was -// a generated by a user action or because a constrained popup got turned -// into a full window). +// a generated by a user action). IPC_MESSAGE_ROUTED0(ViewMsg_DisassociateFromPopupCount) // Used to instruct the RenderView to go into "view source" mode. diff --git a/content/content_browser.gypi b/content/content_browser.gypi index 89bc736..d8c173c 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -483,7 +483,6 @@ 'browser/ssl/ssl_policy_backend.h', 'browser/ssl/ssl_request_info.cc', 'browser/ssl/ssl_request_info.h', - 'browser/tab_contents/constrained_window.h', 'browser/tab_contents/interstitial_page.cc', 'browser/tab_contents/interstitial_page.h', 'browser/tab_contents/navigation_controller.cc', diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc index 02d3cf2..333bdeb 100644 --- a/content/renderer/render_view.cc +++ b/content/renderer/render_view.cc @@ -1788,7 +1788,7 @@ void RenderView::didBlur() { // point to dispatch the ShowView message. // // This method provides us with the information about how to display the newly -// created RenderView (i.e., as a constrained popup or as a new tab). +// created RenderView (i.e., as a blocked popup or as a new tab). // void RenderView::show(WebNavigationPolicy policy) { DCHECK(!did_show_) << "received extraneous Show call"; diff --git a/content/renderer/render_view.h b/content/renderer/render_view.h index e6be86e..8666b69 100644 --- a/content/renderer/render_view.h +++ b/content/renderer/render_view.h @@ -172,7 +172,7 @@ class RenderView : public RenderWidget, public base::SupportsWeakPtr<RenderView> { public: // Creates a new RenderView. The parent_hwnd specifies a HWND to use as the - // parent of the WebView HWND that will be created. If this is a constrained + // parent of the WebView HWND that will be created. If this is a blocked // popup or as a new tab, opener_id is the routing ID of the RenderView // responsible for creating this RenderView (corresponding to parent_hwnd). // |counter| is either a currently initialized counter, or NULL (in which case diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc index ce3ba1b..2f0dfc2 100644 --- a/content/renderer/render_widget.cc +++ b/content/renderer/render_widget.cc @@ -976,7 +976,7 @@ void RenderWidget::didChangeCursor(const WebCursorInfo& cursor_info) { // point to dispatch the ShowWidget message. // // This method provides us with the information about how to display the newly -// created RenderWidget (i.e., as a constrained popup or as a new tab). +// created RenderWidget (i.e., as a blocked popup or as a new tab). // void RenderWidget::show(WebNavigationPolicy) { DCHECK(!did_show_) << "received extraneous Show call"; |