Commit de5b859c authored by Marshall Greenblatt's avatar Marshall Greenblatt

Update to Chromium revision 275973.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1743 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
parent 4e0dddcf
......@@ -8,6 +8,6 @@
{
'chromium_url': 'http://src.chromium.org/svn/trunk/src',
'chromium_revision': '272007',
'chromium_checkout': '556ef20cb5deabfd321c044cba8417c2725266cc',
'chromium_revision': '275973',
'chromium_checkout': '9e96d7351ccb48be8548f7aec7b751b822c7d97c',
}
......@@ -1116,10 +1116,10 @@
'sources': [
'libcef/browser/window_delegate_view.cc',
'libcef/browser/window_delegate_view.h',
'<(DEPTH)/ui/views/test/desktop_test_views_delegate.cc',
'<(DEPTH)/ui/views/test/desktop_test_views_delegate.h',
'<(DEPTH)/ui/views/test/test_views_delegate.cc',
'<(DEPTH)/ui/views/test/desktop_test_views_delegate_aura.cc',
'<(DEPTH)/ui/views/test/test_views_delegate.h',
'<(DEPTH)/ui/views/test/test_views_delegate_aura.cc',
],
}],
],
......
......@@ -14,6 +14,10 @@
'enable_skia_text': 1,
# Disable tcmalloc's debugallocation to avoid crashing during startup.
'disable_debugallocation': 1,
# Disable printing to PDF in the renderer process. This will need to be
# supported in the future as the old printing approach will be removed.
# See https://code.google.com/p/chromiumembedded/issues/detail?id=1313.
'win_pdf_metafile_for_printing': 0,
}, { # OS!="win"
'cef_directory' : '<!(echo $CEF_DIRECTORY)',
}],
......
......@@ -13,12 +13,12 @@ class CefBrowserContext : public content::BrowserContext {
public:
virtual net::URLRequestContextGetter* CreateRequestContext(
content::ProtocolHandlerMap* protocol_handlers,
content::ProtocolHandlerScopedVector protocol_interceptors) = 0;
content::URLRequestInterceptorScopedVector request_interceptors) = 0;
virtual net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
const base::FilePath& partition_path,
bool in_memory,
content::ProtocolHandlerMap* protocol_handlers,
content::ProtocolHandlerScopedVector protocol_interceptors) = 0;
content::URLRequestInterceptorScopedVector request_interceptors) = 0;
};
#endif // CEF_LIBCEF_BROWSER_BROWSER_CONTEXT_H_
......@@ -267,14 +267,14 @@ void CefBrowserContextImpl::CancelMidiSysExPermissionRequest(
void CefBrowserContextImpl::RequestProtectedMediaIdentifierPermission(
int render_process_id,
int render_view_id,
int bridge_id,
int group_id,
const GURL& requesting_frame,
const GURL& origin,
const ProtectedMediaIdentifierPermissionCallback& callback) {
}
void CefBrowserContextImpl::CancelProtectedMediaIdentifierPermissionRequests(
int group_id) {
int render_process_id,
int render_view_id,
const GURL& origin) {
}
content::ResourceContext* CefBrowserContextImpl::GetResourceContext() {
......@@ -300,13 +300,13 @@ quota::SpecialStoragePolicy* CefBrowserContextImpl::GetSpecialStoragePolicy() {
net::URLRequestContextGetter* CefBrowserContextImpl::CreateRequestContext(
content::ProtocolHandlerMap* protocol_handlers,
content::ProtocolHandlerScopedVector protocol_interceptors) {
content::URLRequestInterceptorScopedVector request_interceptors) {
DCHECK(!url_request_getter_);
url_request_getter_ = new CefURLRequestContextGetter(
BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::IO),
BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::FILE),
protocol_handlers,
protocol_interceptors.Pass());
request_interceptors.Pass());
resource_context_->set_url_request_context_getter(url_request_getter_.get());
return url_request_getter_.get();
}
......@@ -316,6 +316,6 @@ net::URLRequestContextGetter*
const base::FilePath& partition_path,
bool in_memory,
content::ProtocolHandlerMap* protocol_handlers,
content::ProtocolHandlerScopedVector protocol_interceptors) {
content::URLRequestInterceptorScopedVector request_interceptors) {
return NULL;
}
......@@ -54,12 +54,12 @@ class CefBrowserContextImpl : public CefBrowserContext {
virtual void RequestProtectedMediaIdentifierPermission(
int render_process_id,
int render_view_id,
int bridge_id,
int group_id,
const GURL& requesting_frame,
const GURL& origin,
const ProtectedMediaIdentifierPermissionCallback& callback) OVERRIDE;
virtual void CancelProtectedMediaIdentifierPermissionRequests(
int group_id) OVERRIDE;
int render_process_id,
int render_view_id,
const GURL& origin) OVERRIDE;
virtual content::ResourceContext* GetResourceContext() OVERRIDE;
virtual content::GeolocationPermissionContext*
GetGeolocationPermissionContext() OVERRIDE;
......@@ -69,12 +69,14 @@ class CefBrowserContextImpl : public CefBrowserContext {
// CefBrowserContext methods.
virtual net::URLRequestContextGetter* CreateRequestContext(
content::ProtocolHandlerMap* protocol_handlers,
content::ProtocolHandlerScopedVector protocol_interceptors) OVERRIDE;
content::URLRequestInterceptorScopedVector request_interceptors)
OVERRIDE;
virtual net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
const base::FilePath& partition_path,
bool in_memory,
content::ProtocolHandlerMap* protocol_handlers,
content::ProtocolHandlerScopedVector protocol_interceptors) OVERRIDE;
content::URLRequestInterceptorScopedVector request_interceptors)
OVERRIDE;
private:
class CefResourceContext;
......
......@@ -133,14 +133,14 @@ void CefBrowserContextProxy::CancelMidiSysExPermissionRequest(
void CefBrowserContextProxy::RequestProtectedMediaIdentifierPermission(
int render_process_id,
int render_view_id,
int bridge_id,
int group_id,
const GURL& requesting_frame,
const GURL& origin,
const ProtectedMediaIdentifierPermissionCallback& callback) {
}
void CefBrowserContextProxy::CancelProtectedMediaIdentifierPermissionRequests(
int group_id) {
int render_process_id,
int render_view_id,
const GURL& origin) {
}
content::ResourceContext* CefBrowserContextProxy::GetResourceContext() {
......@@ -162,7 +162,7 @@ quota::SpecialStoragePolicy* CefBrowserContextProxy::GetSpecialStoragePolicy() {
net::URLRequestContextGetter* CefBrowserContextProxy::CreateRequestContext(
content::ProtocolHandlerMap* protocol_handlers,
content::ProtocolHandlerScopedVector protocol_interceptors) {
content::URLRequestInterceptorScopedVector request_interceptors) {
DCHECK(!url_request_getter_);
url_request_getter_ =
new CefURLRequestContextGetterProxy(handler_,
......@@ -177,6 +177,6 @@ net::URLRequestContextGetter*
const base::FilePath& partition_path,
bool in_memory,
content::ProtocolHandlerMap* protocol_handlers,
content::ProtocolHandlerScopedVector protocol_interceptors) {
content::URLRequestInterceptorScopedVector request_interceptors) {
return NULL;
}
......@@ -62,12 +62,12 @@ class CefBrowserContextProxy : public CefBrowserContext {
virtual void RequestProtectedMediaIdentifierPermission(
int render_process_id,
int render_view_id,
int bridge_id,
int group_id,
const GURL& requesting_frame,
const GURL& origin,
const ProtectedMediaIdentifierPermissionCallback& callback) OVERRIDE;
virtual void CancelProtectedMediaIdentifierPermissionRequests(
int group_id) OVERRIDE;
int render_process_id,
int render_view_id,
const GURL& origin) OVERRIDE;
virtual content::ResourceContext* GetResourceContext() OVERRIDE;
virtual content::GeolocationPermissionContext*
GetGeolocationPermissionContext() OVERRIDE;
......@@ -77,12 +77,14 @@ class CefBrowserContextProxy : public CefBrowserContext {
// CefBrowserContext methods.
virtual net::URLRequestContextGetter* CreateRequestContext(
content::ProtocolHandlerMap* protocol_handlers,
content::ProtocolHandlerScopedVector protocol_interceptors) OVERRIDE;
content::URLRequestInterceptorScopedVector request_interceptors)
OVERRIDE;
virtual net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
const base::FilePath& partition_path,
bool in_memory,
content::ProtocolHandlerMap* protocol_handlers,
content::ProtocolHandlerScopedVector protocol_interceptors) OVERRIDE;
content::URLRequestInterceptorScopedVector request_interceptors)
OVERRIDE;
CefRefPtr<CefRequestContextHandler> handler() const { return handler_; }
......
......@@ -37,6 +37,7 @@
#include "content/common/view_messages.h"
#include "content/public/browser/download_manager.h"
#include "content/public/browser/download_url_parameters.h"
#include "content/public/browser/host_zoom_map.h"
#include "content/public/browser/native_web_keyboard_event.h"
#include "content/public/browser/navigation_controller.h"
#include "content/public/browser/navigation_entry.h"
......@@ -680,16 +681,16 @@ double CefBrowserHostImpl::GetZoomLevel() {
return 0;
}
if (web_contents_.get())
return web_contents_->GetZoomLevel();
if (web_contents())
return content::HostZoomMap::GetZoomLevel(web_contents());
return 0;
}
void CefBrowserHostImpl::SetZoomLevel(double zoomLevel) {
if (CEF_CURRENTLY_ON_UIT()) {
if (web_contents_.get())
web_contents_->SetZoomLevel(zoomLevel);
if (web_contents())
content::HostZoomMap::SetZoomLevel(web_contents(), zoomLevel);
} else {
CEF_POST_TASK(CEF_UIT,
base::Bind(&CefBrowserHostImpl::SetZoomLevel, this, zoomLevel));
......
......@@ -37,7 +37,7 @@
#endif
#endif // defined(USE_AURA)
#if defined(USE_AURA) && defined(USE_X11)
#if defined(USE_AURA) && defined(OS_LINUX)
#include "ui/base/ime/input_method_initializer.h"
#endif
......@@ -59,7 +59,7 @@ void CefBrowserMainParts::PreMainMessageLoopStart() {
}
void CefBrowserMainParts::PreEarlyInitialization() {
#if defined(USE_AURA) && defined(USE_X11)
#if defined(USE_AURA) && defined(OS_LINUX)
// TODO(linux): Consider using a real input method or
// views::LinuxUI::SetInstance.
ui::InitializeInputMethodForTesting();
......
......@@ -25,6 +25,11 @@ void ChromeBrowserProcessStub::EndSession() {
NOTIMPLEMENTED();
};
MetricsServicesManager* ChromeBrowserProcessStub::GetMetricsServicesManager() {
NOTIMPLEMENTED();
return NULL;
}
MetricsService* ChromeBrowserProcessStub::metrics_service() {
NOTIMPLEMENTED();
return NULL;
......@@ -252,6 +257,13 @@ WebRtcLogUploader* ChromeBrowserProcessStub::webrtc_log_uploader() {
}
#endif
NetworkTimeTracker* ChromeBrowserProcessStub::network_time_tracker() {
network_time::NetworkTimeTracker*
ChromeBrowserProcessStub::network_time_tracker() {
NOTIMPLEMENTED();
return NULL;
}
gcm::GCMDriver* ChromeBrowserProcessStub::gcm_driver() {
NOTIMPLEMENTED();
return NULL;
}
......@@ -31,6 +31,7 @@ class ChromeBrowserProcessStub : public BrowserProcess {
// BrowserProcess implementation.
virtual void ResourceDispatcherHostCreated() OVERRIDE;
virtual void EndSession() OVERRIDE;
virtual MetricsServicesManager* GetMetricsServicesManager() OVERRIDE;
virtual MetricsService* metrics_service() OVERRIDE;
virtual rappor::RapporService* rappor_service() OVERRIDE;
virtual IOThread* io_thread() OVERRIDE;
......@@ -91,7 +92,8 @@ class ChromeBrowserProcessStub : public BrowserProcess {
#if defined(ENABLE_WEBRTC)
virtual WebRtcLogUploader* webrtc_log_uploader() OVERRIDE;
#endif
virtual NetworkTimeTracker* network_time_tracker() OVERRIDE;
virtual network_time::NetworkTimeTracker* network_time_tracker() OVERRIDE;
virtual gcm::GCMDriver* gcm_driver() OVERRIDE;
private:
std::string locale_;
......
......@@ -551,12 +551,12 @@ void CefContentBrowserClient::RenderProcessWillLaunch(
net::URLRequestContextGetter* CefContentBrowserClient::CreateRequestContext(
content::BrowserContext* content_browser_context,
content::ProtocolHandlerMap* protocol_handlers,
content::ProtocolHandlerScopedVector protocol_interceptors) {
content::URLRequestInterceptorScopedVector request_interceptors) {
CefBrowserContext* cef_browser_context =
static_cast<CefBrowserContext*>(content_browser_context);
return cef_browser_context->CreateRequestContext(
protocol_handlers,
protocol_interceptors.Pass());
request_interceptors.Pass());
}
net::URLRequestContextGetter*
......@@ -565,14 +565,14 @@ CefContentBrowserClient::CreateRequestContextForStoragePartition(
const base::FilePath& partition_path,
bool in_memory,
content::ProtocolHandlerMap* protocol_handlers,
content::ProtocolHandlerScopedVector protocol_interceptors) {
content::URLRequestInterceptorScopedVector request_interceptors) {
CefBrowserContext* cef_browser_context =
static_cast<CefBrowserContext*>(content_browser_context);
return cef_browser_context->CreateRequestContextForStoragePartition(
partition_path,
in_memory,
protocol_handlers,
protocol_interceptors.Pass());
request_interceptors.Pass());
}
bool CefContentBrowserClient::IsHandledURL(const GURL& url) {
......@@ -732,7 +732,6 @@ bool CefContentBrowserClient::CanCreateWindow(
bool opener_suppressed,
content::ResourceContext* context,
int render_process_id,
bool is_guest,
int opener_id,
bool* no_javascript_access) {
CEF_REQUIRE_IOT();
......
......@@ -86,13 +86,15 @@ class CefContentBrowserClient : public content::ContentBrowserClient {
virtual net::URLRequestContextGetter* CreateRequestContext(
content::BrowserContext* browser_context,
content::ProtocolHandlerMap* protocol_handlers,
content::ProtocolHandlerScopedVector protocol_interceptors) OVERRIDE;
content::URLRequestInterceptorScopedVector request_interceptors)
OVERRIDE;
virtual net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
content::BrowserContext* browser_context,
const base::FilePath& partition_path,
bool in_memory,
content::ProtocolHandlerMap* protocol_handlers,
content::ProtocolHandlerScopedVector protocol_interceptors) OVERRIDE;
content::URLRequestInterceptorScopedVector request_interceptors)
OVERRIDE;
virtual bool IsHandledURL(const GURL& url) OVERRIDE;
virtual void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
int child_process_id) OVERRIDE;
......@@ -125,7 +127,6 @@ class CefContentBrowserClient : public content::ContentBrowserClient {
bool opener_suppressed,
content::ResourceContext* context,
int render_process_id,
bool is_guest,
int opener_id,
bool* no_javascript_access) OVERRIDE;
virtual void ResourceDispatcherHostCreated() OVERRIDE;
......
......@@ -41,6 +41,7 @@ class Target : public content::DevToolsTarget {
explicit Target(content::WebContents* web_contents);
virtual std::string GetId() const OVERRIDE { return id_; }
virtual std::string GetParentId() const OVERRIDE { return std::string(); }
virtual std::string GetType() const OVERRIDE { return kTargetTypePage; }
virtual std::string GetTitle() const OVERRIDE { return title_; }
virtual std::string GetDescription() const OVERRIDE { return std::string(); }
......@@ -110,7 +111,8 @@ CefDevToolsDelegate::CefDevToolsDelegate(int port) {
devtools_http_handler_ = content::DevToolsHttpHandler::Start(
new net::TCPListenSocketFactory("127.0.0.1", port),
"",
this);
this,
base::FilePath());
}
CefDevToolsDelegate::~CefDevToolsDelegate() {
......
......@@ -17,6 +17,7 @@
#include "net/url_request/file_protocol_handler.h"
#include "net/url_request/ftp_protocol_handler.h"
#include "net/url_request/url_request_job_factory_impl.h"
#include "url/url_constants.h"
namespace scheme {
......@@ -25,11 +26,11 @@ void InstallInternalProtectedHandlers(
content::ProtocolHandlerMap* protocol_handlers,
net::FtpTransactionFactory* ftp_transaction_factory) {
protocol_handlers->insert(
std::make_pair(content::kDataScheme,
std::make_pair(url::kDataScheme,
linked_ptr<net::URLRequestJobFactory::ProtocolHandler>(
new net::DataProtocolHandler)));
protocol_handlers->insert(
std::make_pair(content::kFileScheme,
std::make_pair(url::kFileScheme,
linked_ptr<net::URLRequestJobFactory::ProtocolHandler>(
new net::FileProtocolHandler(
content::BrowserThread::GetBlockingPool()->
......@@ -37,7 +38,7 @@ void InstallInternalProtectedHandlers(
base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)))));
#if !defined(DISABLE_FTP_SUPPORT)
protocol_handlers->insert(
std::make_pair(content::kFtpScheme,
std::make_pair(url::kFtpScheme,
linked_ptr<net::URLRequestJobFactory::ProtocolHandler>(
new net::FtpProtocolHandler(ftp_transaction_factory))));
#endif
......
......@@ -47,11 +47,12 @@
#include "net/ssl/default_server_bound_cert_store.h"
#include "net/ssl/server_bound_cert_service.h"
#include "net/ssl/ssl_config_service_defaults.h"
#include "url/url_constants.h"
#include "net/url_request/http_user_agent_settings.h"
#include "net/url_request/protocol_intercept_job_factory.h"
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_storage.h"
#include "net/url_request/url_request_intercepting_job_factory.h"
#include "net/url_request/url_request_job_factory_impl.h"
#include "net/url_request/url_request_job_manager.h"
......@@ -101,10 +102,10 @@ CefURLRequestContextGetter::CefURLRequestContextGetter(
base::MessageLoop* io_loop,
base::MessageLoop* file_loop,
content::ProtocolHandlerMap* protocol_handlers,
content::ProtocolHandlerScopedVector protocol_interceptors)
content::URLRequestInterceptorScopedVector request_interceptors)
: io_loop_(io_loop),
file_loop_(file_loop),
protocol_interceptors_(protocol_interceptors.Pass()) {
request_interceptors_(request_interceptors.Pass()) {
// Must first be created on the UI thread.
CEF_REQUIRE_UIT();
......@@ -237,14 +238,14 @@ net::URLRequestContext* CefURLRequestContextGetter::GetURLRequestContext() {
// Set up interceptors in the reverse order.
scoped_ptr<net::URLRequestJobFactory> top_job_factory =
job_factory.PassAs<net::URLRequestJobFactory>();
for (content::ProtocolHandlerScopedVector::reverse_iterator i =
protocol_interceptors_.rbegin();
i != protocol_interceptors_.rend();
for (content::URLRequestInterceptorScopedVector::reverse_iterator i =
request_interceptors_.rbegin();
i != request_interceptors_.rend();
++i) {
top_job_factory.reset(new net::ProtocolInterceptJobFactory(
top_job_factory.reset(new net::URLRequestInterceptingJobFactory(
top_job_factory.Pass(), make_scoped_ptr(*i)));
}
protocol_interceptors_.weak_clear();
request_interceptors_.weak_clear();
storage_->set_job_factory(top_job_factory.release());
......
......@@ -82,7 +82,7 @@ class CefURLRequestContextGetter : public net::URLRequestContextGetter {
base::MessageLoop* io_loop,
base::MessageLoop* file_loop,
content::ProtocolHandlerMap* protocol_handlers,
content::ProtocolHandlerScopedVector protocol_interceptors);
content::URLRequestInterceptorScopedVector request_interceptors);
virtual ~CefURLRequestContextGetter();
// net::URLRequestContextGetter implementation.
......@@ -118,7 +118,7 @@ class CefURLRequestContextGetter : public net::URLRequestContextGetter {
scoped_ptr<net::URLSecurityManager> url_security_manager_;
scoped_ptr<net::FtpTransactionFactory> ftp_transaction_factory_;
content::ProtocolHandlerMap protocol_handlers_;
content::ProtocolHandlerScopedVector protocol_interceptors_;
content::URLRequestInterceptorScopedVector request_interceptors_;
net::URLRequestJobFactoryImpl* job_factory_impl_;
typedef std::set<CefURLRequestContextProxy*> RequestContextProxySet;
......
......@@ -33,7 +33,6 @@ void CefWindowDelegateView::Init(
params.parent_widget = parent_widget;
params.bounds = bounds;
params.delegate = this;
params.top_level = true;
// Set the WS_CHILD flag.
params.child = true;
// Set the WS_VISIBLE flag.
......@@ -46,6 +45,8 @@ void CefWindowDelegateView::Init(
// |widget| should now be associated with |this|.
DCHECK_EQ(widget, GetWidget());
// |widget| must be top-level for focus handling to work correctly.
DCHECK(widget->is_top_level());
}
void CefWindowDelegateView::InitContent() {
......
......@@ -6,6 +6,7 @@
#include "libcef/common/content_client.h"
#include "content/public/common/url_constants.h"
#include "url/url_constants.h"
namespace scheme {
......@@ -25,12 +26,12 @@ void AddInternalSchemes(std::vector<std::string>* standard_schemes) {
bool IsInternalHandledScheme(const std::string& scheme) {
static const char* schemes[] = {
content::kBlobScheme,
url::kBlobScheme,
content::kChromeDevToolsScheme,
content::kChromeUIScheme,
content::kDataScheme,
content::kFileScheme,
content::kFileSystemScheme,
url::kDataScheme,
url::kFileScheme,
url::kFileSystemScheme,
};
for (size_t i = 0; i < sizeof(schemes) / sizeof(schemes[0]); ++i) {
......@@ -46,13 +47,13 @@ bool IsInternalProtectedScheme(const std::string& scheme) {
// content/browser/storage_partition_impl_map.cc and are modified by
// InstallInternalProtectedHandlers().
static const char* schemes[] = {
content::kBlobScheme,
url::kBlobScheme,
content::kChromeUIScheme,
content::kDataScheme,
content::kFileScheme,
content::kFileSystemScheme,
url::kDataScheme,
url::kFileScheme,
url::kFileSystemScheme,
#if !defined(DISABLE_FTP_SUPPORT)
content::kFtpScheme,
url::kFtpScheme,
#endif
};
......
......@@ -15,7 +15,8 @@ patches = [
# Fix Xcode 4 build on OS X Lion.
# http://codereview.chromium.org/8086022/
#
# Don't use aura on Linux.
# Disable Warning 4702 ("Unreachable code") for Windows VS builds.
# https://code.google.com/p/chromium/issues/detail?id=346399#c55
'name': 'build',
'path': '../build/',
},
......
Index: common.gypi
===================================================================
--- common.gypi (revision 272007)
--- common.gypi (revision 275973)
+++ common.gypi (working copy)
@@ -9,6 +9,9 @@
# Variables expected to be overriden on the GYP command line (-D) or by
......@@ -12,9 +12,19 @@ Index: common.gypi
# Putting a variables dict inside another variables dict looks kind of
# weird. This is done so that 'host_arch', 'chromeos', etc are defined as
# variables within the outer variables dict here. This is necessary
@@ -5058,6 +5061,9 @@
# removed as code is fixed.
4100, 4121, 4125, 4127, 4130, 4131, 4189, 4201, 4238, 4244, 4245,
4310, 4428, 4481, 4505, 4510, 4512, 4530, 4610, 4611, 4701, 4706,
+ # Disable Warning 4702 ("Unreachable code")
+ # https://code.google.com/p/chromium/issues/detail?id=346399#c55
+ 4702,
],
'msvs_settings': {
'VCCLCompilerTool': {
Index: mac/strip_save_dsym
===================================================================
--- mac/strip_save_dsym (revision 272007)
--- mac/strip_save_dsym (revision 275973)
+++ mac/strip_save_dsym (working copy)
@@ -48,7 +48,7 @@
"bundle"]
......
Index: public/renderer/content_renderer_client.cc
===================================================================
--- public/renderer/content_renderer_client.cc (revision 272007)
--- public/renderer/content_renderer_client.cc (revision 275973)
+++ public/renderer/content_renderer_client.cc (working copy)
@@ -92,7 +92,6 @@
return false;
......@@ -20,7 +20,7 @@ Index: public/renderer/content_renderer_client.cc
const GURL& url,
Index: public/renderer/content_renderer_client.h
===================================================================
--- public/renderer/content_renderer_client.h (revision 272007)
--- public/renderer/content_renderer_client.h (revision 275973)
+++ public/renderer/content_renderer_client.h (working copy)
@@ -176,7 +176,6 @@
// Returns true if a popup window should be allowed.
......@@ -40,9 +40,9 @@ Index: public/renderer/content_renderer_client.h
// If |send_referrer| is set to false (which is the default), no referrer
Index: renderer/render_frame_impl.cc
===================================================================
--- renderer/render_frame_impl.cc (revision 272007)
--- renderer/render_frame_impl.cc (revision 275973)
+++ renderer/render_frame_impl.cc (working copy)
@@ -3084,7 +3084,6 @@
@@ -3143,7 +3143,6 @@
WebNavigationType type,
WebNavigationPolicy default_policy,
bool is_redirect) {
......@@ -50,7 +50,7 @@ Index: renderer/render_frame_impl.cc
// The handlenavigation API is deprecated and will be removed once
// crbug.com/325351 is resolved.
if (request.url() != GURL(kSwappedOutURL) &&
@@ -3099,7 +3098,6 @@
@@ -3158,7 +3157,6 @@
is_redirect)) {
return blink::WebNavigationPolicyIgnore;
}
......
Index: resource_ids
===================================================================
--- resource_ids (revision 272007)
--- resource_ids (revision 275973)
+++ resource_ids (working copy)
@@ -16,6 +16,12 @@
{
......
Index: gyp/generator/ninja.py
===================================================================
--- gyp/generator/ninja.py (revision 1921)
--- gyp/generator/ninja.py (revision 1927)
+++ gyp/generator/ninja.py (working copy)
@@ -738,7 +738,16 @@
for path in copy['files']:
......
Index: message_loop.cc
===================================================================
--- message_loop.cc (revision 272007)
--- message_loop.cc (revision 275973)
+++ message_loop.cc (working copy)
@@ -154,7 +154,7 @@
MessageLoop::~MessageLoop() {
......
Index: public/common/common_param_traits_macros.h
===================================================================
--- public/common/common_param_traits_macros.h (revision 272007)
--- public/common/common_param_traits_macros.h (revision 275973)
+++ public/common/common_param_traits_macros.h (working copy)
@@ -175,6 +175,7 @@
@@ -177,6 +177,7 @@
IPC_STRUCT_TRAITS_MEMBER(initialize_at_minimum_page_scale)
IPC_STRUCT_TRAITS_MEMBER(smart_insert_delete_enabled)
IPC_STRUCT_TRAITS_MEMBER(compositor_touch_hit_testing)
......@@ -12,9 +12,9 @@ Index: public/common/common_param_traits_macros.h