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

Side by Side Diff: chrome/test/chromedriver/chrome/navigation_tracker.cc

Issue 605143002: [chromedriver] Accept git hashes in blink version strings from devtools (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix review nits Created 6 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/chromedriver/chrome/navigation_tracker.h" 5 #include "chrome/test/chromedriver/chrome/navigation_tracker.h"
6 6
7 #include "base/strings/stringprintf.h" 7 #include "base/strings/stringprintf.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/test/chromedriver/chrome/browser_info.h"
9 #include "chrome/test/chromedriver/chrome/devtools_client.h" 10 #include "chrome/test/chromedriver/chrome/devtools_client.h"
10 #include "chrome/test/chromedriver/chrome/status.h" 11 #include "chrome/test/chromedriver/chrome/status.h"
11 #include "chrome/test/chromedriver/chrome/version.h"
12 12
13 NavigationTracker::NavigationTracker(DevToolsClient* client, 13 NavigationTracker::NavigationTracker(DevToolsClient* client,
14 const BrowserInfo* browser_info) 14 const BrowserInfo* browser_info)
15 : client_(client), 15 : client_(client),
16 loading_state_(kUnknown), 16 loading_state_(kUnknown),
17 browser_info_(browser_info) { 17 browser_info_(browser_info) {
18 client_->AddListener(this); 18 client_->AddListener(this);
19 } 19 }
20 20
21 NavigationTracker::NavigationTracker(DevToolsClient* client, 21 NavigationTracker::NavigationTracker(DevToolsClient* client,
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 loading_state_ = kLoading; 201 loading_state_ = kLoading;
202 } 202 }
203 return Status(kOk); 203 return Status(kOk);
204 } 204 }
205 205
206 void NavigationTracker::ResetLoadingState(LoadingState loading_state) { 206 void NavigationTracker::ResetLoadingState(LoadingState loading_state) {
207 loading_state_ = loading_state; 207 loading_state_ = loading_state;
208 pending_frame_set_.clear(); 208 pending_frame_set_.clear();
209 scheduled_frame_set_.clear(); 209 scheduled_frame_set_.clear();
210 } 210 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698