Update to Chromium revision d3cf92ca (#310534).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1963 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2015-01-09 17:22:10 +00:00
parent b5e8914bde
commit ba198e9ef1
44 changed files with 583 additions and 404 deletions

View File

@@ -12,9 +12,10 @@
#include "base/command_line.h"
// CefCommandLine implementation
class CefCommandLineImpl : public CefValueBase<CefCommandLine, CommandLine> {
class CefCommandLineImpl :
public CefValueBase<CefCommandLine, base::CommandLine> {
public:
CefCommandLineImpl(CommandLine* value,
CefCommandLineImpl(base::CommandLine* value,
bool will_delete,
bool read_only);
@@ -42,7 +43,7 @@ class CefCommandLineImpl : public CefValueBase<CefCommandLine, CommandLine> {
void PrependWrapper(const CefString& wrapper) override;
// Must hold the controller lock while using this value.
const CommandLine& command_line() { return const_value(); }
const base::CommandLine& command_line() { return const_value(); }
DISALLOW_COPY_AND_ASSIGN(CefCommandLineImpl);
};