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

Side by Side Diff: content/renderer/browser_plugin/browser_plugin.cc

Issue 11111020: <browser>: Always read <browser>.src attribute from <object>.src. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments from fsamuel@ Created 8 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
« no previous file with comments | « chrome/test/data/extensions/platform_apps/browser_tag_src_attribute/test.js ('k') | no next file » | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/renderer/browser_plugin/browser_plugin.h" 5 #include "content/renderer/browser_plugin/browser_plugin.h"
6 6
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #if defined (OS_WIN) 9 #if defined (OS_WIN)
10 #include "base/sys_info.h" 10 #include "base/sys_info.h"
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 // Record that we sent a NavigateGuest message to embedder. Once we send 129 // Record that we sent a NavigateGuest message to embedder. Once we send
130 // such a message, subsequent SetSrcAttribute() calls must always send 130 // such a message, subsequent SetSrcAttribute() calls must always send
131 // NavigateGuest messages to the embedder (even if |src| is empty), so 131 // NavigateGuest messages to the embedder (even if |src| is empty), so
132 // resize works correctly for all cases (e.g. The embedder can reset the 132 // resize works correctly for all cases (e.g. The embedder can reset the
133 // guest's |src| to empty value, resize and then set the |src| to a 133 // guest's |src| to empty value, resize and then set the |src| to a
134 // non-empty value). 134 // non-empty value).
135 // Additionally, once this instance has navigated, the storage partition 135 // Additionally, once this instance has navigated, the storage partition
136 // cannot be changed, so this value is used for enforcing this. 136 // cannot be changed, so this value is used for enforcing this.
137 navigate_src_sent_ = true; 137 navigate_src_sent_ = true;
138 } 138 }
139 src_ = src; 139 if (!src.empty()) {
140 src_ = src;
141 return;
Fady Samuel 2012/10/12 20:03:36 That seems wrong? If the src is not empty, we shou
lazyboy 2012/10/12 20:41:14 I did the wrong change on that pass :S Now moved t
142 }
140 guest_crashed_ = false; 143 guest_crashed_ = false;
141 } 144 }
142 145
143 std::string BrowserPlugin::GetPartitionAttribute() const { 146 std::string BrowserPlugin::GetPartitionAttribute() const {
144 std::string value; 147 std::string value;
145 if (persist_storage_) 148 if (persist_storage_)
146 value.append(kPersistPrefix); 149 value.append(kPersistPrefix);
147 150
148 value.append(storage_partition_id_); 151 value.append(storage_partition_id_);
149 return value; 152 return value;
(...skipping 607 matching lines...) Expand 10 before | Expand all | Expand 10 after
757 void* notify_data) { 760 void* notify_data) {
758 } 761 }
759 762
760 void BrowserPlugin::didFailLoadingFrameRequest( 763 void BrowserPlugin::didFailLoadingFrameRequest(
761 const WebKit::WebURL& url, 764 const WebKit::WebURL& url,
762 void* notify_data, 765 void* notify_data,
763 const WebKit::WebURLError& error) { 766 const WebKit::WebURLError& error) {
764 } 767 }
765 768
766 } // namespace content 769 } // namespace content
OLDNEW
« no previous file with comments | « chrome/test/data/extensions/platform_apps/browser_tag_src_attribute/test.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698