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

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

Issue 518013: Merge 32634 - Make executeScript and insertCSS inject code into all frames.... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/249/src/
Patch Set: Created 11 years 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
Property Changes:
Deleted: svn:mergeinfo
Reverse-merged /branches/chrome_webkit_merge_branch/chrome/browser/tab_contents.cc:r69-2775
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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/tab_contents/tab_contents.h" 5 #include "chrome/browser/tab_contents/tab_contents.h"
6 6
7 #include "app/gfx/text_elider.h" 7 #include "app/gfx/text_elider.h"
8 #include "app/l10n_util.h" 8 #include "app/l10n_util.h"
9 #include "app/resource_bundle.h" 9 #include "app/resource_bundle.h"
10 #include "base/file_version_info.h" 10 #include "base/file_version_info.h"
(...skipping 859 matching lines...) Expand 10 before | Expand all | Expand 10 after
870 } 870 }
871 PopupNotificationVisibilityChanged(ShowingBlockedPopupNotification()); 871 PopupNotificationVisibilityChanged(ShowingBlockedPopupNotification());
872 } 872 }
873 873
874 void TabContents::CloseAllSuppressedPopups() { 874 void TabContents::CloseAllSuppressedPopups() {
875 if (blocked_popups_) 875 if (blocked_popups_)
876 blocked_popups_->CloseAll(); 876 blocked_popups_->CloseAll();
877 } 877 }
878 878
879 void TabContents::ExecuteCode(int request_id, const std::string& extension_id, 879 void TabContents::ExecuteCode(int request_id, const std::string& extension_id,
880 bool is_js_code, const std::string& code_string) { 880 bool is_js_code, const std::string& code_string,
881 bool all_frames) {
881 render_view_host()->Send( 882 render_view_host()->Send(
882 new ViewMsg_ExecuteCode(render_view_host()->routing_id(), request_id, 883 new ViewMsg_ExecuteCode(render_view_host()->routing_id(), request_id,
883 extension_id, is_js_code, code_string)); 884 extension_id, is_js_code, code_string,
885 all_frames));
884 } 886 }
885 887
886 void TabContents::PopupNotificationVisibilityChanged(bool visible) { 888 void TabContents::PopupNotificationVisibilityChanged(bool visible) {
887 render_view_host()->PopupNotificationVisibilityChanged(visible); 889 render_view_host()->PopupNotificationVisibilityChanged(visible);
888 } 890 }
889 891
890 gfx::NativeView TabContents::GetContentNativeView() const { 892 gfx::NativeView TabContents::GetContentNativeView() const {
891 return view_->GetContentNativeView(); 893 return view_->GetContentNativeView();
892 } 894 }
893 895
(...skipping 1815 matching lines...) Expand 10 before | Expand all | Expand 10 after
2709 render_view_host()->JavaScriptMessageBoxClosed(reply_msg, success, prompt); 2711 render_view_host()->JavaScriptMessageBoxClosed(reply_msg, success, prompt);
2710 } 2712 }
2711 2713
2712 void TabContents::SetSuppressMessageBoxes(bool suppress_message_boxes) { 2714 void TabContents::SetSuppressMessageBoxes(bool suppress_message_boxes) {
2713 set_suppress_javascript_messages(suppress_message_boxes); 2715 set_suppress_javascript_messages(suppress_message_boxes);
2714 } 2716 }
2715 2717
2716 void TabContents::set_encoding(const std::string& encoding) { 2718 void TabContents::set_encoding(const std::string& encoding) {
2717 encoding_ = CharacterEncoding::GetCanonicalEncodingNameByAliasName(encoding); 2719 encoding_ = CharacterEncoding::GetCanonicalEncodingNameByAliasName(encoding);
2718 } 2720 }
OLDNEW
« no previous file with comments | « chrome/browser/tab_contents/tab_contents.h ('k') | chrome/common/extensions/api/extension_api.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698