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

8
tests/unittests/tracing_unittest.cc
View File

@ -5,7 +5,7 @@
// Include this first to avoid type conflicts with CEF headers.
#include "tests/unittests/chromium_includes.h"
#include "base/file_util.h"
#include "base/files/file_util.h"
#include "base/synchronization/waitable_event.h"
#include "include/base/cef_bind.h"
@ -89,7 +89,7 @@ class TracingTestHandler : public CefEndTracingCallback,
}
// CefEndTracingCallback method:
virtual void OnEndTracingComplete(const CefString& tracing_file) OVERRIDE {
void OnEndTracingComplete(const CefString& tracing_file) override {
EXPECT_UI_THREAD();
base::FilePath file_path(tracing_file);
@ -104,7 +104,7 @@ class TracingTestHandler : public CefEndTracingCallback,
CefBeginTracing(kTraceTestCategory, this);
}
virtual void OnComplete() OVERRIDE {
void OnComplete() override {
EXPECT_UI_THREAD();
switch (type_) {
@ -336,7 +336,7 @@ class TracingTestHandler : public CefEndTracingCallback,
}
private:
virtual ~TracingTestHandler() {}
~TracingTestHandler() override {}
// Handle used to notify when the test is complete.
base::WaitableEvent completion_event_;