| 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 7789957a2415893f00ffead915d1b0c1d146a18c..0cd2116e7e0cc5c35bff45c228d4f994548a3efb 100644
|
| --- a/chrome/browser/automation/testing_automation_provider.cc
|
| +++ b/chrome/browser/automation/testing_automation_provider.cc
|
| @@ -1698,6 +1698,8 @@ void TestingAutomationProvider::SendJSONRequest(int handle,
|
| &TestingAutomationProvider::CloseTabJSON;
|
| handler_map["SetViewBounds"] =
|
| &TestingAutomationProvider::SetViewBounds;
|
| + handler_map["MaximizeWindow"] =
|
| + &TestingAutomationProvider::MaximizeWindow;
|
| handler_map["WebkitMouseMove"] =
|
| &TestingAutomationProvider::WebkitMouseMove;
|
| handler_map["WebkitMouseClick"] =
|
| @@ -6498,7 +6500,25 @@ void TestingAutomationProvider::SetViewBounds(
|
| reply.SendError(Error(automation::kInvalidId, error));
|
| return;
|
| }
|
| - browser->window()->SetBounds(gfx::Rect(x, y, width, height));
|
| + BrowserWindow* browser_window = browser->window();
|
| + if (browser_window->IsMaximized()) {
|
| + browser_window->Restore();
|
| + }
|
| + browser_window->SetBounds(gfx::Rect(x, y, width, height));
|
| + reply.SendSuccess(NULL);
|
| +}
|
| +
|
| +void TestingAutomationProvider::MaximizeWindow(
|
| + base::DictionaryValue* args,
|
| + IPC::Message* reply_message) {
|
| + AutomationJSONReply reply(this, reply_message);
|
| + Browser* browser;
|
| + std::string error;
|
| + if (!GetBrowserFromJSONArgs(args, &browser, &error)) {
|
| + reply.SendError(Error(automation::kInvalidId, error));
|
| + return;
|
| + }
|
| + browser->window()->Maximize();
|
| reply.SendSuccess(NULL);
|
| }
|
|
|
|
|