Merge 32634 - Make executeScript and insertCSS inject code into all frames....

chrome/browser/tab_contents/tab_contents.cc

Index: chrome/browser/tab_contents/tab_contents.cc
===================================================================
--- chrome/browser/tab_contents/tab_contents.cc	(revision 35240)
+++ chrome/browser/tab_contents/tab_contents.cc	(working copy)
@@ -877,10 +877,12 @@
 }
 
 void TabContents::ExecuteCode(int request_id, const std::string& extension_id,
-                              bool is_js_code, const std::string& code_string) {
+                              bool is_js_code, const std::string& code_string,
+                              bool all_frames) {
   render_view_host()->Send(
       new ViewMsg_ExecuteCode(render_view_host()->routing_id(), request_id,
-                              extension_id, is_js_code, code_string));
+                              extension_id, is_js_code, code_string,
+                              all_frames));
 }
 
 void TabContents::PopupNotificationVisibilityChanged(bool visible) {
Property changes on: chrome\browser\tab_contents\tab_contents.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   Reverse-merged /branches/chrome_webkit_merge_branch/chrome/browser/tab_contents.cc:r69-2775