Update to Chromium revision 788460a4 (#345352)

- Mac: 10.10 SDK is now required for building (see http://crbug.com/463170#c63).
  Older SDKs can be used for a short time by setting mac_sdk_min via GYP_DEFINES.
This commit is contained in:
Marshall Greenblatt
2015-08-25 18:33:31 -04:00
parent aa72f402ba
commit 9af98fab45
38 changed files with 153 additions and 93 deletions

View File

@@ -1,8 +1,8 @@
diff --git browser/browser_plugin/browser_plugin_guest.cc browser/browser_plugin/browser_plugin_guest.cc
index 6991a29..6aed799 100644
index b0de6b9..d0cab8f 100644
--- browser/browser_plugin/browser_plugin_guest.cc
+++ browser/browser_plugin/browser_plugin_guest.cc
@@ -22,7 +22,7 @@
@@ -23,7 +23,7 @@
#include "content/browser/renderer_host/render_widget_host_impl.h"
#include "content/browser/renderer_host/render_widget_host_view_base.h"
#include "content/browser/web_contents/web_contents_impl.h"
@@ -11,7 +11,7 @@ index 6991a29..6aed799 100644
#include "content/common/browser_plugin/browser_plugin_constants.h"
#include "content/common/browser_plugin/browser_plugin_messages.h"
#include "content/common/content_constants_internal.h"
@@ -275,20 +275,19 @@ void BrowserPluginGuest::InitInternal(
@@ -286,20 +286,19 @@ void BrowserPluginGuest::InitInternal(
guest_window_rect_ = params.view_rect;
if (owner_web_contents_ != owner_web_contents) {
@@ -36,7 +36,7 @@ index 6991a29..6aed799 100644
}
RendererPreferences* renderer_prefs =
@@ -720,12 +719,9 @@ void BrowserPluginGuest::OnWillAttachComplete(
@@ -731,12 +730,9 @@ void BrowserPluginGuest::OnWillAttachComplete(
// This will trigger a callback to RenderViewReady after a round-trip IPC.
static_cast<RenderViewHostImpl*>(
GetWebContents()->GetRenderViewHost())->Init();