Update to Chromium version 55.0.2883.87
This commit is contained in:
parent
c993bcadc3
commit
f264ab9620
|
@ -7,5 +7,5 @@
|
|||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||
|
||||
{
|
||||
'chromium_checkout': 'refs/tags/55.0.2883.59',
|
||||
'chromium_checkout': 'refs/tags/55.0.2883.87',
|
||||
}
|
||||
|
|
|
@ -318,10 +318,10 @@ index 68e6acd..d545c54 100644
|
|||
// This must come after SetContentsView() or it might not be able to find
|
||||
// the correct NativeTheme (on Linux). See http://crbug.com/384492
|
||||
diff --git ui/views/widget/widget.h ui/views/widget/widget.h
|
||||
index 1e62c09..7fa0520 100644
|
||||
index 06c8f12..023f75c 100644
|
||||
--- ui/views/widget/widget.h
|
||||
+++ ui/views/widget/widget.h
|
||||
@@ -240,6 +240,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
|
||||
@@ -243,6 +243,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
|
||||
// Whether the widget should be maximized or minimized.
|
||||
ui::WindowShowState show_state;
|
||||
gfx::NativeView parent;
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
|
||||
index d5d02cb..8c62781 100644
|
||||
index 8ac8614..4fe92d4 100644
|
||||
--- chrome/app/generated_resources.grd
|
||||
+++ chrome/app/generated_resources.grd
|
||||
@@ -7073,7 +7073,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
|
||||
@@ -7080,7 +7080,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
|
||||
</message>
|
||||
</if>
|
||||
<message name="IDS_PLUGIN_BLOCKED_BY_POLICY" desc="The placeholder text for a plugin blocked by enterprise policy.">
|
||||
|
|
Loading…
Reference in New Issue