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/test/automation/tab_proxy.h" | 5 #include "chrome/test/automation/tab_proxy.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/json/json_value_serializer.h" | 9 #include "base/json/json_value_serializer.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 711 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
722 if (!is_valid()) | 722 if (!is_valid()) |
723 return false; | 723 return false; |
724 | 724 |
725 int browser_index, tab_index; | 725 int browser_index, tab_index; |
726 std::string error_msg; | 726 std::string error_msg; |
727 if (!SendGetIndicesFromTabHandleJSONRequest( | 727 if (!SendGetIndicesFromTabHandleJSONRequest( |
728 sender_, handle_, &browser_index, &tab_index, &error_msg)) { | 728 sender_, handle_, &browser_index, &tab_index, &error_msg)) { |
729 return false; | 729 return false; |
730 } | 730 } |
731 | 731 |
732 return SendCaptureEntirePageJSONRequest(sender_, browser_index, | 732 return SendCaptureEntirePageJSONRequest( |
733 tab_index, path, &error_msg); | 733 sender_, WebViewLocator::ForIndexPair(browser_index, tab_index), |
| 734 path, &error_msg); |
734 } | 735 } |
735 | 736 |
736 #if defined(OS_WIN) && !defined(USE_AURA) | 737 #if defined(OS_WIN) && !defined(USE_AURA) |
737 void TabProxy::Reposition(HWND window, HWND window_insert_after, int left, | 738 void TabProxy::Reposition(HWND window, HWND window_insert_after, int left, |
738 int top, int width, int height, int flags, | 739 int top, int width, int height, int flags, |
739 HWND parent_window) { | 740 HWND parent_window) { |
740 Reposition_Params params; | 741 Reposition_Params params; |
741 params.window = window; | 742 params.window = window; |
742 params.window_insert_after = window_insert_after; | 743 params.window_insert_after = window_insert_after; |
743 params.left = left; | 744 params.left = left; |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
834 json)); | 835 json)); |
835 } | 836 } |
836 | 837 |
837 void TabProxy::FirstObjectAdded() { | 838 void TabProxy::FirstObjectAdded() { |
838 AddRef(); | 839 AddRef(); |
839 } | 840 } |
840 | 841 |
841 void TabProxy::LastObjectRemoved() { | 842 void TabProxy::LastObjectRemoved() { |
842 Release(); | 843 Release(); |
843 } | 844 } |
OLD | NEW |