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

14
tests/unittests/display_unittest.cc
View File

@@ -31,7 +31,7 @@ class TitleTestHandler : public TestHandler {
TitleTestHandler()
: step_(0) {}
virtual void RunTest() OVERRIDE {
void RunTest() override {
// Add the resources that we will navigate to/from.
AddResource(kTitleUrl1,
"<html><head><title>" + std::string(kTitleStr1) +
@@ -47,8 +47,8 @@ class TitleTestHandler : public TestHandler {
CreateBrowser(kTitleUrl1);
}
virtual void OnTitleChange(CefRefPtr<CefBrowser> browser,
const CefString& title) OVERRIDE {
void OnTitleChange(CefRefPtr<CefBrowser> browser,
const CefString& title) override {
std::string title_str = title;
if (step_ == 0 || step_ == 2) {
EXPECT_STREQ(kTitleStr1, title_str.c_str());
@@ -69,9 +69,9 @@ class TitleTestHandler : public TestHandler {
DestroyTest();
}
virtual void OnLoadEnd(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
int httpStatusCode) OVERRIDE {
void OnLoadEnd(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
int httpStatusCode) override {
switch (step_++) {
case 0:
frame->LoadURL(kTitleUrl2);
@@ -91,7 +91,7 @@ class TitleTestHandler : public TestHandler {
}
private:
virtual void DestroyTest() OVERRIDE {
void DestroyTest() override {
for (int i = 0; i < 5; ++i)
EXPECT_TRUE(got_title_[i]) << "step " << i;