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

18
tests/unittests/dialog_unittest.cc
View File

@ -45,9 +45,9 @@ class DialogTestHandler : public TestHandler {
: handler_(handler) {
}
virtual void OnFileDialogDismissed(
void OnFileDialogDismissed(
CefRefPtr<CefBrowserHost> browser_host,
const std::vector<CefString>& file_paths) OVERRIDE {
const std::vector<CefString>& file_paths) override {
handler_->got_onfiledialogdismissed_.yes();
std::string url = browser_host->GetBrowser()->GetMainFrame()->GetURL();
@ -72,16 +72,16 @@ class DialogTestHandler : public TestHandler {
: config_(config) {
}
virtual void RunTest() OVERRIDE {
void RunTest() override {
AddResource(kTestUrl, "<html><body>TEST</body></html>", "text/html");
// Create the browser
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 {
browser->GetHost()->RunFileDialog(config_.mode,
config_.title,
config_.default_file_name,
@ -97,13 +97,13 @@ class DialogTestHandler : public TestHandler {
}
// CefDialogHandler
virtual bool OnFileDialog(
bool OnFileDialog(
CefRefPtr<CefBrowser> browser,
FileDialogMode mode,
const CefString& title,
const CefString& default_file_name,
const std::vector<CefString>& accept_types,
CefRefPtr<CefFileDialogCallback> callback) OVERRIDE {
CefRefPtr<CefFileDialogCallback> callback) override {
got_onfiledialog_.yes();
std::string url = browser->GetMainFrame()->GetURL();
@ -125,7 +125,7 @@ class DialogTestHandler : public TestHandler {
return true;
}
virtual void DestroyTest() OVERRIDE {
void DestroyTest() override {
EXPECT_TRUE(got_onfiledialog_);
EXPECT_TRUE(got_onfiledialogdismissed_);