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

Side by Side Diff: chrome/test/automation/tab_proxy.cc

Issue 27060: Make basic bits of chrome/test/automation build on Linux. (Closed)
Patch Set: use base::kNoTimeout Created 11 years, 10 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 unified diff | Download patch
« no previous file with comments | « chrome/test/automation/tab_proxy.h ('k') | chrome/test/automation/window_proxy.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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/logging.h" 9 #include "base/logging.h"
10 #include "chrome/common/json_value_serializer.h" 10 #include "chrome/common/json_value_serializer.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 &ordinal2, 65 &ordinal2,
66 &matches)); 66 &matches));
67 if (!succeeded) 67 if (!succeeded)
68 return -1; 68 return -1;
69 if (ordinal) 69 if (ordinal)
70 *ordinal = ordinal2; 70 *ordinal = ordinal2;
71 return matches; 71 return matches;
72 } 72 }
73 73
74 AutomationMsg_NavigationResponseValues TabProxy::NavigateToURL(const GURL& url) { 74 AutomationMsg_NavigationResponseValues TabProxy::NavigateToURL(const GURL& url) {
75 return NavigateToURLWithTimeout(url, INFINITE, NULL); 75 return NavigateToURLWithTimeout(url, base::kNoTimeout, NULL);
76 } 76 }
77 77
78 AutomationMsg_NavigationResponseValues TabProxy::NavigateToURLWithTimeout( 78 AutomationMsg_NavigationResponseValues TabProxy::NavigateToURLWithTimeout(
79 const GURL& url, uint32 timeout_ms, bool* is_timeout) { 79 const GURL& url, uint32 timeout_ms, bool* is_timeout) {
80 if (!is_valid()) 80 if (!is_valid())
81 return AUTOMATION_MSG_NAVIGATION_ERROR; 81 return AUTOMATION_MSG_NAVIGATION_ERROR;
82 82
83 AutomationMsg_NavigationResponseValues navigate_response = 83 AutomationMsg_NavigationResponseValues navigate_response =
84 AUTOMATION_MSG_NAVIGATION_ERROR; 84 AUTOMATION_MSG_NAVIGATION_ERROR;
85 85
(...skipping 508 matching lines...) Expand 10 before | Expand all | Expand 10 after
594 594
595 bool TabProxy::OverrideEncoding(const std::wstring& encoding) { 595 bool TabProxy::OverrideEncoding(const std::wstring& encoding) {
596 if (!is_valid()) 596 if (!is_valid())
597 return false; 597 return false;
598 598
599 bool succeeded = false; 599 bool succeeded = false;
600 sender_->Send(new AutomationMsg_OverrideEncoding(0, handle_, encoding, 600 sender_->Send(new AutomationMsg_OverrideEncoding(0, handle_, encoding,
601 &succeeded)); 601 &succeeded));
602 return succeeded; 602 return succeeded;
603 } 603 }
OLDNEW
« no previous file with comments | « chrome/test/automation/tab_proxy.h ('k') | chrome/test/automation/window_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698