bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 40af916d (#303546).

Browse Source 
- Standardize usage of virtual/override specifiers in CEF internals (see http://crbug.com/417463).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1903 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2014-11-12 19:25:15 +00:00
parent 470518a52e
commit eef89ccdd3
329 changed files with 3160 additions and 3731 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/unittests/geolocation_unittest.cc
View File

@ -36,7 +36,7 @@ class GeolocationTestHandler : public TestHandler {
request_id_(-1) {
}
virtual void RunTest() OVERRIDE {
void RunTest() override {
std::string html =
"<html><head><script>"
"navigator.geolocation.getCurrentPosition("
@ -60,9 +60,9 @@ class GeolocationTestHandler : public TestHandler {
CreateBrowser(kTestUrl);
}
virtual void OnLoadEnd(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
int httpStatusCode) OVERRIDE {
void OnLoadEnd(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
int httpStatusCode) override {
std::string url = frame->GetURL();
if (url != kTestUrl) {
if (url == kTestAllowUrl)
@ -83,11 +83,11 @@ class GeolocationTestHandler : public TestHandler {
callback->Continue(false);
}
virtual bool OnRequestGeolocationPermission(
bool OnRequestGeolocationPermission(
CefRefPtr<CefBrowser> browser,
const CefString& requesting_url,
int request_id,
CefRefPtr<CefGeolocationCallback> callback) OVERRIDE {
CefRefPtr<CefGeolocationCallback> callback) override {
got_requestgeolocationpermission_.yes();
EXPECT_TRUE(CefCurrentlyOn(TID_UI));
@ -105,10 +105,10 @@ class GeolocationTestHandler : public TestHandler {
return true;
}
virtual void OnCancelGeolocationPermission(
void OnCancelGeolocationPermission(
CefRefPtr<CefBrowser> browser,
const CefString& requesting_url,
int request_id) OVERRIDE {
int request_id) override {
got_cancelgeolocationpermission_.yes();
EXPECT_TRUE(CefCurrentlyOn(TID_UI));
@ -117,7 +117,7 @@ class GeolocationTestHandler : public TestHandler {
EXPECT_EQ(request_id, request_id_);
}
virtual void DestroyTest() OVERRIDE {
void DestroyTest() override {
EXPECT_TRUE(got_requestgeolocationpermission_);
if (mode_ == TEST_CANCEL)
EXPECT_TRUE(got_cancelgeolocationpermission_);
@ -185,7 +185,7 @@ class TestGetGeolocationCallback : public CefGetGeolocationCallback {
: event_(event) {
}
virtual void OnLocationUpdate(const CefGeoposition& position) OVERRIDE {
void OnLocationUpdate(const CefGeoposition& position) override {
EXPECT_TRUE(CefCurrentlyOn(TID_UI));
EXPECT_EQ(position.error_code, GEOPOSITON_ERROR_NONE);
EXPECT_NE(position.latitude, 0.0);