| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/automation/automation_provider.h" | 5 #include "chrome/browser/automation/automation_provider.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/callback.h" | 8 #include "base/callback.h" |
| 9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
| 10 #include "base/json/json_reader.h" | 10 #include "base/json/json_reader.h" |
| (...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 336 restore_tab_helper()->session_id().id(); | 336 restore_tab_helper()->session_id().id(); |
| 337 } else { | 337 } else { |
| 338 external_tab_container->Uninitialize(); | 338 external_tab_container->Uninitialize(); |
| 339 } | 339 } |
| 340 | 340 |
| 341 TRACE_EVENT_END_ETW("AutomationProvider::ConnectExternalTab", 0, ""); | 341 TRACE_EVENT_END_ETW("AutomationProvider::ConnectExternalTab", 0, ""); |
| 342 } | 342 } |
| 343 | 343 |
| 344 void AutomationProvider::OnBrowserMoved(int tab_handle) { | 344 void AutomationProvider::OnBrowserMoved(int tab_handle) { |
| 345 ExternalTabContainer* external_tab = GetExternalTabForHandle(tab_handle); | 345 ExternalTabContainer* external_tab = GetExternalTabForHandle(tab_handle); |
| 346 if (external_tab) { | 346 if (!external_tab) { |
| 347 external_tab->WindowMoved(); | |
| 348 } else { | |
| 349 DLOG(WARNING) << | 347 DLOG(WARNING) << |
| 350 "AutomationProvider::OnBrowserMoved called with invalid tab handle."; | 348 "AutomationProvider::OnBrowserMoved called with invalid tab handle."; |
| 351 } | 349 } |
| 352 } | 350 } |
| 353 | 351 |
| 354 void AutomationProvider::OnMessageFromExternalHost(int handle, | 352 void AutomationProvider::OnMessageFromExternalHost(int handle, |
| 355 const std::string& message, | 353 const std::string& message, |
| 356 const std::string& origin, | 354 const std::string& origin, |
| 357 const std::string& target) { | 355 const std::string& target) { |
| 358 RenderViewHost* view_host = GetViewForTab(handle); | 356 RenderViewHost* view_host = GetViewForTab(handle); |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 398 void AutomationProvider::OnSetZoomLevel(int handle, int zoom_level) { | 396 void AutomationProvider::OnSetZoomLevel(int handle, int zoom_level) { |
| 399 if (tab_tracker_->ContainsHandle(handle)) { | 397 if (tab_tracker_->ContainsHandle(handle)) { |
| 400 NavigationController* tab = tab_tracker_->GetResource(handle); | 398 NavigationController* tab = tab_tracker_->GetResource(handle); |
| 401 if (tab->tab_contents() && tab->tab_contents()->render_view_host()) { | 399 if (tab->tab_contents() && tab->tab_contents()->render_view_host()) { |
| 402 RenderViewHost* host = tab->tab_contents()->render_view_host(); | 400 RenderViewHost* host = tab->tab_contents()->render_view_host(); |
| 403 content::PageZoom zoom = static_cast<content::PageZoom>(zoom_level); | 401 content::PageZoom zoom = static_cast<content::PageZoom>(zoom_level); |
| 404 host->Zoom(zoom); | 402 host->Zoom(zoom); |
| 405 } | 403 } |
| 406 } | 404 } |
| 407 } | 405 } |
| OLD | NEW |