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

Side by Side Diff: chrome/browser/web_contents.cc

Issue 10973: Test the feasibility of turning Chrome into a multi-process ActiveX control Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 12 years, 1 month 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/views/tabs/dragged_tab_controller.cc ('k') | chrome/client/ReadMe.txt » ('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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 #include "chrome/browser/web_contents.h" 5 #include "chrome/browser/web_contents.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/file_version_info.h" 9 #include "base/file_version_info.h"
10 #include "base/process_util.h" 10 #include "base/process_util.h"
(...skipping 833 matching lines...) Expand 10 before | Expand all | Expand 10 after
844 void WebContents::Close(RenderViewHost* rvh) { 844 void WebContents::Close(RenderViewHost* rvh) {
845 // Ignore this if it comes from a RenderViewHost that we aren't showing, and 845 // Ignore this if it comes from a RenderViewHost that we aren't showing, and
846 // refuse to allow javascript to close this window if we have a blocked popup 846 // refuse to allow javascript to close this window if we have a blocked popup
847 // notification. 847 // notification.
848 if (delegate() && rvh == render_view_host() && 848 if (delegate() && rvh == render_view_host() &&
849 !ShowingBlockedPopupNotification()) 849 !ShowingBlockedPopupNotification())
850 delegate()->CloseContents(this); 850 delegate()->CloseContents(this);
851 } 851 }
852 852
853 void WebContents::RequestMove(const gfx::Rect& new_bounds) { 853 void WebContents::RequestMove(const gfx::Rect& new_bounds) {
854 if (delegate() && delegate()->IsPopup(this)) 854 if (delegate() && (delegate()->IsPopup(this) || delegate()->IsEmbedded(this)))
855 delegate()->MoveContents(this, new_bounds); 855 delegate()->MoveContents(this, new_bounds);
856 } 856 }
857 857
858 void WebContents::DidStartLoading(RenderViewHost* rvh, int32 page_id) { 858 void WebContents::DidStartLoading(RenderViewHost* rvh, int32 page_id) {
859 if (plugin_installer_ != NULL) 859 if (plugin_installer_ != NULL)
860 plugin_installer_->OnStartLoading(); 860 plugin_installer_->OnStartLoading();
861 SetIsLoading(true, NULL); 861 SetIsLoading(true, NULL);
862 } 862 }
863 863
864 void WebContents::DidStopLoading(RenderViewHost* rvh, int32 page_id) { 864 void WebContents::DidStopLoading(RenderViewHost* rvh, int32 page_id) {
(...skipping 969 matching lines...) Expand 10 before | Expand all | Expand 10 after
1834 // The favicon url isn't valid. This means there really isn't a favicon, 1834 // The favicon url isn't valid. This means there really isn't a favicon,
1835 // or the favicon url wasn't obtained before the load started. This assumes 1835 // or the favicon url wasn't obtained before the load started. This assumes
1836 // the later. 1836 // the later.
1837 // TODO(sky): Need a way to set the favicon that doesn't involve generating 1837 // TODO(sky): Need a way to set the favicon that doesn't involve generating
1838 // its url. 1838 // its url.
1839 new_url->SetFavIconURL(TemplateURL::GenerateFaviconURL(params.referrer)); 1839 new_url->SetFavIconURL(TemplateURL::GenerateFaviconURL(params.referrer));
1840 } 1840 }
1841 new_url->set_safe_for_autoreplace(true); 1841 new_url->set_safe_for_autoreplace(true);
1842 url_model->Add(new_url); 1842 url_model->Add(new_url);
1843 } 1843 }
OLDNEW
« no previous file with comments | « chrome/browser/views/tabs/dragged_tab_controller.cc ('k') | chrome/client/ReadMe.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698