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

Unified Diff: chrome/browser/automation/testing_automation_provider.cc

Issue 8416024: Re-land 107645 with static initializers removed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove static initializers Created 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/automation/automation_tab_helper.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/automation/testing_automation_provider.cc
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index 4bc985c8e42c21a3cd25b0dfe302c8ab2a532795..9b61c834e92651995394625a07197455b1acae0a 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -6191,12 +6191,6 @@ void TestingAutomationProvider::GetTabTitleJSON(
void TestingAutomationProvider::CaptureEntirePageJSON(
DictionaryValue* args,
IPC::Message* reply_message) {
-#if defined(OS_LINUX)
- // See crbug.com/89777.
- AutomationJSONReply(this, reply_message).SendError(
- "Taking a page snapshot is not supported on this platform");
- return;
-#endif
if (SendErrorIfModalDialogActive(this, reply_message))
return;
@@ -6220,7 +6214,8 @@ void TestingAutomationProvider::CaptureEntirePageJSON(
FilePath path(path_str);
// This will delete itself when finished.
PageSnapshotTaker* snapshot_taker = new PageSnapshotTaker(
- this, reply_message, render_view, path);
+ this, reply_message,
+ TabContentsWrapper::GetCurrentWrapperForContents(tab_contents), path);
snapshot_taker->Start();
} else {
AutomationJSONReply(this, reply_message)
« no previous file with comments | « chrome/browser/automation/automation_tab_helper.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698