summaryrefslogtreecommitdiffstats
path: root/chrome/browser/web_drop_target.cc
diff options
context:
space:
mode:
authorbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-12 16:11:09 +0000
committerbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-12 16:11:09 +0000
commitb6e09acf8ced26198871626c76bb5a3741cc51f1 (patch)
treea4029d45393a1c34ba1b88d67c052512ad16c7eb /chrome/browser/web_drop_target.cc
parent2526315929de99fa5762583621fb52b626a62ef9 (diff)
downloadchromium_src-b6e09acf8ced26198871626c76bb5a3741cc51f1.zip
chromium_src-b6e09acf8ced26198871626c76bb5a3741cc51f1.tar.gz
chromium_src-b6e09acf8ced26198871626c76bb5a3741cc51f1.tar.bz2
Move RenderViewHost management out of WebContents into a new
RenderViewHostManager object. The goal for this patch is to change no logic or APIs, just move the code. So there are some not very clean callback functions and no new unit tests for this file (although is is still covered by the same WebContents unit tests). This should make the actual cleanup in a later pass much easier to follow. I changed the ordering of only a few operations (like WebContents shutdown), and checked that this shouldn't matter. I had to change the "source" for several notifications since they are no longer sent from the WebContents. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@716 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/web_drop_target.cc')
-rw-r--r--chrome/browser/web_drop_target.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/web_drop_target.cc b/chrome/browser/web_drop_target.cc
index f107d95..aa4dd10 100644
--- a/chrome/browser/web_drop_target.cc
+++ b/chrome/browser/web_drop_target.cc
@@ -116,7 +116,7 @@ DWORD WebDropTarget::OnDragEnter(IDataObject* data_object,
// Don't pass messages to the renderer if an interstitial page is showing
// because we don't want the interstitial page to navigate. Instead,
// pass the messages on to a separate interstitial DropTarget handler.
- if (web_contents_->IsShowingInterstitialPage())
+ if (web_contents_->showing_interstitial_page())
return interstitial_drop_target_->OnDragEnter(data_object, effect);
// TODO(tc): PopulateWebDropData is kind of slow, maybe we can do this in a
@@ -144,7 +144,7 @@ DWORD WebDropTarget::OnDragOver(IDataObject* data_object,
DWORD key_state,
POINT cursor_position,
DWORD effect) {
- if (web_contents_->IsShowingInterstitialPage())
+ if (web_contents_->showing_interstitial_page())
return interstitial_drop_target_->OnDragOver(data_object, effect);
POINT client_pt = cursor_position;
@@ -160,7 +160,7 @@ DWORD WebDropTarget::OnDragOver(IDataObject* data_object,
}
void WebDropTarget::OnDragLeave(IDataObject* data_object) {
- if (web_contents_->IsShowingInterstitialPage()) {
+ if (web_contents_->showing_interstitial_page()) {
interstitial_drop_target_->OnDragLeave(data_object);
} else {
web_contents_->DragTargetDragLeave();
@@ -172,7 +172,7 @@ DWORD WebDropTarget::OnDrop(IDataObject* data_object,
DWORD key_state,
POINT cursor_position,
DWORD effect) {
- if (web_contents_->IsShowingInterstitialPage())
+ if (web_contents_->showing_interstitial_page())
return interstitial_drop_target_->OnDrop(data_object, effect);
POINT client_pt = cursor_position;