mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 126.0.6478.57
This commit is contained in:
@@ -7,5 +7,5 @@
|
|||||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||||
|
|
||||||
{
|
{
|
||||||
'chromium_checkout': 'refs/tags/126.0.6478.26'
|
'chromium_checkout': 'refs/tags/126.0.6478.57'
|
||||||
}
|
}
|
||||||
|
@@ -3463,7 +3463,7 @@ typedef enum {
|
|||||||
CEF_CPAIT_COOKIE_CONTROLS,
|
CEF_CPAIT_COOKIE_CONTROLS,
|
||||||
CEF_CPAIT_FILE_SYSTEM_ACCESS,
|
CEF_CPAIT_FILE_SYSTEM_ACCESS,
|
||||||
CEF_CPAIT_FIND,
|
CEF_CPAIT_FIND,
|
||||||
CEF_CPAIT_HIGH_EFFICIENCY,
|
CEF_CPAIT_MEMORY_SAVER,
|
||||||
CEF_CPAIT_INTENT_PICKER,
|
CEF_CPAIT_INTENT_PICKER,
|
||||||
CEF_CPAIT_LOCAL_CARD_MIGRATION,
|
CEF_CPAIT_LOCAL_CARD_MIGRATION,
|
||||||
CEF_CPAIT_MANAGE_PASSWORDS,
|
CEF_CPAIT_MANAGE_PASSWORDS,
|
||||||
@@ -3487,7 +3487,8 @@ typedef enum {
|
|||||||
CEF_CPAIT_PRICE_INSIGHTS,
|
CEF_CPAIT_PRICE_INSIGHTS,
|
||||||
CEF_CPAIT_PRICE_READ_ANYTHING,
|
CEF_CPAIT_PRICE_READ_ANYTHING,
|
||||||
CEF_CPAIT_PRODUCT_SPECIFICATIONS,
|
CEF_CPAIT_PRODUCT_SPECIFICATIONS,
|
||||||
CEF_CPAIT_MAX_VALUE = CEF_CPAIT_PRODUCT_SPECIFICATIONS,
|
CEF_CPAIT_LENS_OVERLAY,
|
||||||
|
CEF_CPAIT_MAX_VALUE = CEF_CPAIT_LENS_OVERLAY,
|
||||||
} cef_chrome_page_action_icon_type_t;
|
} cef_chrome_page_action_icon_type_t;
|
||||||
|
|
||||||
///
|
///
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git DEPS DEPS
|
diff --git DEPS DEPS
|
||||||
index 5183762f9cedc..c691198319e88 100644
|
index 03652696e2e40..b684b58db41ff 100644
|
||||||
--- DEPS
|
--- DEPS
|
||||||
+++ DEPS
|
+++ DEPS
|
||||||
@@ -2102,16 +2102,16 @@ deps = {
|
@@ -2102,16 +2102,16 @@ deps = {
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git base/BUILD.gn base/BUILD.gn
|
diff --git base/BUILD.gn base/BUILD.gn
|
||||||
index 575149b2f3246..74719a39cf4e4 100644
|
index 4c7130084a91f..c0e00c6fc2636 100644
|
||||||
--- base/BUILD.gn
|
--- base/BUILD.gn
|
||||||
+++ base/BUILD.gn
|
+++ base/BUILD.gn
|
||||||
@@ -41,6 +41,7 @@ import("//build/nocompile.gni")
|
@@ -41,6 +41,7 @@ import("//build/nocompile.gni")
|
||||||
@@ -10,7 +10,7 @@ index 575149b2f3246..74719a39cf4e4 100644
|
|||||||
import("//testing/libfuzzer/fuzzer_test.gni")
|
import("//testing/libfuzzer/fuzzer_test.gni")
|
||||||
import("//testing/test.gni")
|
import("//testing/test.gni")
|
||||||
|
|
||||||
@@ -1525,7 +1526,11 @@ component("base") {
|
@@ -1526,7 +1527,11 @@ component("base") {
|
||||||
"hash/md5_constexpr_internal.h",
|
"hash/md5_constexpr_internal.h",
|
||||||
"hash/sha1.h",
|
"hash/sha1.h",
|
||||||
]
|
]
|
||||||
@@ -23,7 +23,7 @@ index 575149b2f3246..74719a39cf4e4 100644
|
|||||||
sources += [
|
sources += [
|
||||||
"hash/md5_nacl.cc",
|
"hash/md5_nacl.cc",
|
||||||
"hash/md5_nacl.h",
|
"hash/md5_nacl.h",
|
||||||
@@ -1954,6 +1959,12 @@ component("base") {
|
@@ -1955,6 +1960,12 @@ component("base") {
|
||||||
defines += [ "COM_INIT_CHECK_HOOK_DISABLED" ]
|
defines += [ "COM_INIT_CHECK_HOOK_DISABLED" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git third_party/blink/public/web/web_element.h third_party/blink/public/web/web_element.h
|
diff --git third_party/blink/public/web/web_element.h third_party/blink/public/web/web_element.h
|
||||||
index 103cbab74b515..3b763e5100340 100644
|
index 97a83c2510a8e..426594b26de48 100644
|
||||||
--- third_party/blink/public/web/web_element.h
|
--- third_party/blink/public/web/web_element.h
|
||||||
+++ third_party/blink/public/web/web_element.h
|
+++ third_party/blink/public/web/web_element.h
|
||||||
@@ -82,6 +82,9 @@ class BLINK_EXPORT WebElement : public WebNode {
|
@@ -82,6 +82,9 @@ class BLINK_EXPORT WebElement : public WebNode {
|
||||||
@@ -13,10 +13,10 @@ index 103cbab74b515..3b763e5100340 100644
|
|||||||
// Returns true if the element's contenteditable attribute is in the true
|
// Returns true if the element's contenteditable attribute is in the true
|
||||||
// state or in the plaintext-only state:
|
// state or in the plaintext-only state:
|
||||||
diff --git third_party/blink/renderer/core/exported/web_element.cc third_party/blink/renderer/core/exported/web_element.cc
|
diff --git third_party/blink/renderer/core/exported/web_element.cc third_party/blink/renderer/core/exported/web_element.cc
|
||||||
index f05470ff9c673..7ffee95e4540b 100644
|
index df64535ec3091..304aa5beb342f 100644
|
||||||
--- third_party/blink/renderer/core/exported/web_element.cc
|
--- third_party/blink/renderer/core/exported/web_element.cc
|
||||||
+++ third_party/blink/renderer/core/exported/web_element.cc
|
+++ third_party/blink/renderer/core/exported/web_element.cc
|
||||||
@@ -118,6 +118,24 @@ void WebElement::SetAttribute(const WebString& attr_name,
|
@@ -119,6 +119,24 @@ void WebElement::SetAttribute(const WebString& attr_name,
|
||||||
IGNORE_EXCEPTION_FOR_TESTING);
|
IGNORE_EXCEPTION_FOR_TESTING);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -74,7 +74,7 @@ index e857e2363da9e..3dd4db8ae4267 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
|
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
|
||||||
index e4c38df62e93e..6956a4a6e19ca 100644
|
index f61a369f16ee3..a0313d74a02ee 100644
|
||||||
--- chrome/browser/ui/BUILD.gn
|
--- chrome/browser/ui/BUILD.gn
|
||||||
+++ chrome/browser/ui/BUILD.gn
|
+++ chrome/browser/ui/BUILD.gn
|
||||||
@@ -8,6 +8,7 @@ import("//build/config/compiler/compiler.gni")
|
@@ -8,6 +8,7 @@ import("//build/config/compiler/compiler.gni")
|
||||||
@@ -113,7 +113,7 @@ index e4c38df62e93e..6956a4a6e19ca 100644
|
|||||||
"views/apps/app_info_dialog/arc_app_info_links_panel.cc",
|
"views/apps/app_info_dialog/arc_app_info_links_panel.cc",
|
||||||
"views/apps/app_info_dialog/arc_app_info_links_panel.h",
|
"views/apps/app_info_dialog/arc_app_info_links_panel.h",
|
||||||
"views/apps/chrome_app_window_client_views_chromeos.cc",
|
"views/apps/chrome_app_window_client_views_chromeos.cc",
|
||||||
@@ -5117,8 +5125,6 @@ static_library("ui") {
|
@@ -5118,8 +5126,6 @@ static_library("ui") {
|
||||||
"views/accessibility/theme_tracking_non_accessible_image_view.h",
|
"views/accessibility/theme_tracking_non_accessible_image_view.h",
|
||||||
"views/apps/app_dialog/app_dialog_view.cc",
|
"views/apps/app_dialog/app_dialog_view.cc",
|
||||||
"views/apps/app_dialog/app_dialog_view.h",
|
"views/apps/app_dialog/app_dialog_view.h",
|
||||||
@@ -122,7 +122,7 @@ index e4c38df62e93e..6956a4a6e19ca 100644
|
|||||||
"views/apps/app_info_dialog/app_info_dialog_container.cc",
|
"views/apps/app_info_dialog/app_info_dialog_container.cc",
|
||||||
"views/apps/app_info_dialog/app_info_dialog_container.h",
|
"views/apps/app_info_dialog/app_info_dialog_container.h",
|
||||||
"views/apps/app_info_dialog/app_info_dialog_views.cc",
|
"views/apps/app_info_dialog/app_info_dialog_views.cc",
|
||||||
@@ -6969,6 +6975,7 @@ static_library("ui") {
|
@@ -6972,6 +6978,7 @@ static_library("ui") {
|
||||||
if (enable_printing) {
|
if (enable_printing) {
|
||||||
deps += [
|
deps += [
|
||||||
"//components/printing/browser",
|
"//components/printing/browser",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git chrome/browser/renderer_context_menu/render_view_context_menu.cc chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
diff --git chrome/browser/renderer_context_menu/render_view_context_menu.cc chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
||||||
index 4f866d176dccf..c2abc6231c727 100644
|
index de0d60b248414..7eae5ff63383a 100644
|
||||||
--- chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
--- chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
||||||
+++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
+++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
||||||
@@ -359,6 +359,18 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
|
@@ -359,6 +359,18 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
|
||||||
@@ -60,7 +60,7 @@ index 4f866d176dccf..c2abc6231c727 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
Profile* RenderViewContextMenu::GetProfile() const {
|
Profile* RenderViewContextMenu::GetProfile() const {
|
||||||
@@ -3578,6 +3608,26 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
|
@@ -3590,6 +3620,26 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
|
||||||
execute_plugin_action_callback_ = std::move(cb);
|
execute_plugin_action_callback_ = std::move(cb);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -422,7 +422,7 @@ index 3c12614c4d7d2..1dc97ecf5a11e 100644
|
|||||||
+#endif
|
+#endif
|
||||||
}
|
}
|
||||||
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
|
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
|
||||||
index 675a9ab64ea08..d0c160a14b2a7 100644
|
index 7acca810b6f4e..cc6e90f9a993e 100644
|
||||||
--- chrome/browser/chrome_content_browser_client.cc
|
--- chrome/browser/chrome_content_browser_client.cc
|
||||||
+++ chrome/browser/chrome_content_browser_client.cc
|
+++ chrome/browser/chrome_content_browser_client.cc
|
||||||
@@ -46,6 +46,7 @@
|
@@ -46,6 +46,7 @@
|
||||||
@@ -512,7 +512,7 @@ index 675a9ab64ea08..d0c160a14b2a7 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() {
|
base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() {
|
||||||
@@ -6592,7 +6599,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
|
@@ -6598,7 +6605,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -521,7 +521,7 @@ index 675a9ab64ea08..d0c160a14b2a7 100644
|
|||||||
content::BrowserContext* context,
|
content::BrowserContext* context,
|
||||||
bool in_memory,
|
bool in_memory,
|
||||||
const base::FilePath& relative_partition_path,
|
const base::FilePath& relative_partition_path,
|
||||||
@@ -6610,6 +6617,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
|
@@ -6616,6 +6623,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
|
||||||
network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
|
network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
|
||||||
network_context_params->accept_language = GetApplicationLocale();
|
network_context_params->accept_language = GetApplicationLocale();
|
||||||
}
|
}
|
||||||
@@ -530,7 +530,7 @@ index 675a9ab64ea08..d0c160a14b2a7 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
std::vector<base::FilePath>
|
std::vector<base::FilePath>
|
||||||
@@ -7732,10 +7741,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
|
@@ -7738,10 +7747,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
|
||||||
const auto now = base::TimeTicks::Now();
|
const auto now = base::TimeTicks::Now();
|
||||||
const auto timeout = GetKeepaliveTimerTimeout(context);
|
const auto timeout = GetKeepaliveTimerTimeout(context);
|
||||||
keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout);
|
keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout);
|
||||||
@@ -543,7 +543,7 @@ index 675a9ab64ea08..d0c160a14b2a7 100644
|
|||||||
FROM_HERE, keepalive_deadline_ - now,
|
FROM_HERE, keepalive_deadline_ - now,
|
||||||
base::BindOnce(
|
base::BindOnce(
|
||||||
&ChromeContentBrowserClient::OnKeepaliveTimerFired,
|
&ChromeContentBrowserClient::OnKeepaliveTimerFired,
|
||||||
@@ -7754,7 +7763,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
|
@@ -7760,7 +7769,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
|
||||||
--num_keepalive_requests_;
|
--num_keepalive_requests_;
|
||||||
if (num_keepalive_requests_ == 0) {
|
if (num_keepalive_requests_ == 0) {
|
||||||
DVLOG(1) << "Stopping the keepalive timer";
|
DVLOG(1) << "Stopping the keepalive timer";
|
||||||
@@ -553,7 +553,7 @@ index 675a9ab64ea08..d0c160a14b2a7 100644
|
|||||||
// This deletes the keep alive handle attached to the timer function and
|
// This deletes the keep alive handle attached to the timer function and
|
||||||
// unblock the shutdown sequence.
|
// unblock the shutdown sequence.
|
||||||
}
|
}
|
||||||
@@ -7923,7 +7933,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
|
@@ -7929,7 +7939,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
|
||||||
const auto now = base::TimeTicks::Now();
|
const auto now = base::TimeTicks::Now();
|
||||||
const auto then = keepalive_deadline_;
|
const auto then = keepalive_deadline_;
|
||||||
if (now < then) {
|
if (now < then) {
|
||||||
|
@@ -931,10 +931,10 @@ index b862ceac7225d..9575440a77d67 100644
|
|||||||
LocationBarView* location_bar_view = browser_view_->GetLocationBarView();
|
LocationBarView* location_bar_view = browser_view_->GetLocationBarView();
|
||||||
CHECK(location_bar_view);
|
CHECK(location_bar_view);
|
||||||
diff --git chrome/browser/ui/views/page_action/page_action_icon_controller.cc chrome/browser/ui/views/page_action/page_action_icon_controller.cc
|
diff --git chrome/browser/ui/views/page_action/page_action_icon_controller.cc chrome/browser/ui/views/page_action/page_action_icon_controller.cc
|
||||||
index ad0147f9b8fe8..80aea21bb605a 100644
|
index e9bc6c28db30f..38ddcb98139b0 100644
|
||||||
--- chrome/browser/ui/views/page_action/page_action_icon_controller.cc
|
--- chrome/browser/ui/views/page_action/page_action_icon_controller.cc
|
||||||
+++ chrome/browser/ui/views/page_action/page_action_icon_controller.cc
|
+++ chrome/browser/ui/views/page_action/page_action_icon_controller.cc
|
||||||
@@ -96,6 +96,12 @@ void PageActionIconController::Init(const PageActionIconParams& params,
|
@@ -97,6 +97,12 @@ void PageActionIconController::Init(const PageActionIconParams& params,
|
||||||
};
|
};
|
||||||
|
|
||||||
for (PageActionIconType type : params.types_enabled) {
|
for (PageActionIconType type : params.types_enabled) {
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git tools/gritsettings/resource_ids.spec tools/gritsettings/resource_ids.spec
|
diff --git tools/gritsettings/resource_ids.spec tools/gritsettings/resource_ids.spec
|
||||||
index f3ca54d7277ac..16a52e64f3078 100644
|
index 06d0495497697..320803be93f6b 100644
|
||||||
--- tools/gritsettings/resource_ids.spec
|
--- tools/gritsettings/resource_ids.spec
|
||||||
+++ tools/gritsettings/resource_ids.spec
|
+++ tools/gritsettings/resource_ids.spec
|
||||||
@@ -1312,6 +1312,15 @@
|
@@ -1312,6 +1312,15 @@
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc
|
diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc
|
||||||
index a59f9bacf36ef..c432e25d58862 100644
|
index 66a06bba31b24..e341d0f50a250 100644
|
||||||
--- content/browser/renderer_host/render_widget_host_view_aura.cc
|
--- content/browser/renderer_host/render_widget_host_view_aura.cc
|
||||||
+++ content/browser/renderer_host/render_widget_host_view_aura.cc
|
+++ content/browser/renderer_host/render_widget_host_view_aura.cc
|
||||||
@@ -6,6 +6,7 @@
|
@@ -6,6 +6,7 @@
|
||||||
@@ -35,7 +35,7 @@ index a59f9bacf36ef..c432e25d58862 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
#if BUILDFLAG(IS_WIN)
|
#if BUILDFLAG(IS_WIN)
|
||||||
@@ -2377,6 +2381,16 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
|
@@ -2374,6 +2378,16 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
|
||||||
window_->layer()->SetColor(GetBackgroundColor() ? *GetBackgroundColor()
|
window_->layer()->SetColor(GetBackgroundColor() ? *GetBackgroundColor()
|
||||||
: SK_ColorWHITE);
|
: SK_ColorWHITE);
|
||||||
UpdateFrameSinkIdRegistration();
|
UpdateFrameSinkIdRegistration();
|
||||||
|
@@ -165,7 +165,7 @@ index 3c862290eab9c..0e85970c08486 100644
|
|||||||
LabelButtonImageContainer* image_container() {
|
LabelButtonImageContainer* image_container() {
|
||||||
return image_container_.get();
|
return image_container_.get();
|
||||||
diff --git ui/views/controls/label.cc ui/views/controls/label.cc
|
diff --git ui/views/controls/label.cc ui/views/controls/label.cc
|
||||||
index 2c773355d2961..9ccba5a459bd5 100644
|
index 5fc895ab7b5e2..f913b6964ce32 100644
|
||||||
--- ui/views/controls/label.cc
|
--- ui/views/controls/label.cc
|
||||||
+++ ui/views/controls/label.cc
|
+++ ui/views/controls/label.cc
|
||||||
@@ -51,12 +51,29 @@ enum LabelPropertyKey {
|
@@ -51,12 +51,29 @@ enum LabelPropertyKey {
|
||||||
@@ -198,7 +198,7 @@ index 2c773355d2961..9ccba5a459bd5 100644
|
|||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
namespace views {
|
namespace views {
|
||||||
@@ -485,6 +502,15 @@ void Label::SetElideBehavior(gfx::ElideBehavior elide_behavior) {
|
@@ -480,6 +497,15 @@ void Label::SetElideBehavior(gfx::ElideBehavior elide_behavior) {
|
||||||
OnPropertyChanged(&elide_behavior_, kPropertyEffectsPreferredSizeChanged);
|
OnPropertyChanged(&elide_behavior_, kPropertyEffectsPreferredSizeChanged);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -214,7 +214,7 @@ index 2c773355d2961..9ccba5a459bd5 100644
|
|||||||
std::u16string Label::GetTooltipText() const {
|
std::u16string Label::GetTooltipText() const {
|
||||||
return tooltip_text_;
|
return tooltip_text_;
|
||||||
}
|
}
|
||||||
@@ -789,6 +815,16 @@ std::unique_ptr<gfx::RenderText> Label::CreateRenderText() const {
|
@@ -784,6 +810,16 @@ std::unique_ptr<gfx::RenderText> Label::CreateRenderText() const {
|
||||||
render_text->SelectRange(stored_selection_range_);
|
render_text->SelectRange(stored_selection_range_);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -791,7 +791,7 @@ index dcf4b60ad92c2..64fa80edefc1b 100644
|
|||||||
#if !BUILDFLAG(IS_CHROMEOS_LACROS)
|
#if !BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||||
if (root_location != root_current_location &&
|
if (root_location != root_current_location &&
|
||||||
diff --git ui/views/view.h ui/views/view.h
|
diff --git ui/views/view.h ui/views/view.h
|
||||||
index 4024ec9778c21..d4eeb4c2922e1 100644
|
index e21731ab75726..1af07b1c6eb2c 100644
|
||||||
--- ui/views/view.h
|
--- ui/views/view.h
|
||||||
+++ ui/views/view.h
|
+++ ui/views/view.h
|
||||||
@@ -25,6 +25,7 @@
|
@@ -25,6 +25,7 @@
|
||||||
|
@@ -530,10 +530,10 @@ index 6383110804d44..e5bc85f63fab9 100644
|
|||||||
break;
|
break;
|
||||||
case ui::SHOW_STATE_END:
|
case ui::SHOW_STATE_END:
|
||||||
diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc
|
diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc
|
||||||
index f2f1f54c474cf..2feb6a47c04e1 100644
|
index e113e926b324c..572eccab19085 100644
|
||||||
--- ui/views/widget/widget.cc
|
--- ui/views/widget/widget.cc
|
||||||
+++ ui/views/widget/widget.cc
|
+++ ui/views/widget/widget.cc
|
||||||
@@ -409,7 +409,8 @@ void Widget::Init(InitParams params) {
|
@@ -410,7 +410,8 @@ void Widget::Init(InitParams params) {
|
||||||
}
|
}
|
||||||
|
|
||||||
params.child |= (params.type == InitParams::TYPE_CONTROL);
|
params.child |= (params.type == InitParams::TYPE_CONTROL);
|
||||||
@@ -543,7 +543,7 @@ index f2f1f54c474cf..2feb6a47c04e1 100644
|
|||||||
is_headless_ = params.ShouldInitAsHeadless();
|
is_headless_ = params.ShouldInitAsHeadless();
|
||||||
is_autosized_ = params.autosize;
|
is_autosized_ = params.autosize;
|
||||||
|
|
||||||
@@ -501,9 +502,14 @@ void Widget::Init(InitParams params) {
|
@@ -502,9 +503,14 @@ void Widget::Init(InitParams params) {
|
||||||
|
|
||||||
if (show_state == ui::SHOW_STATE_MAXIMIZED) {
|
if (show_state == ui::SHOW_STATE_MAXIMIZED) {
|
||||||
Maximize();
|
Maximize();
|
||||||
@@ -558,7 +558,7 @@ index f2f1f54c474cf..2feb6a47c04e1 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||||
@@ -517,7 +523,12 @@ void Widget::Init(InitParams params) {
|
@@ -518,7 +524,12 @@ void Widget::Init(InitParams params) {
|
||||||
} else if (delegate) {
|
} else if (delegate) {
|
||||||
SetContentsView(delegate->TransferOwnershipOfContentsView());
|
SetContentsView(delegate->TransferOwnershipOfContentsView());
|
||||||
if (should_set_initial_bounds) {
|
if (should_set_initial_bounds) {
|
||||||
@@ -572,7 +572,7 @@ index f2f1f54c474cf..2feb6a47c04e1 100644
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1696,10 +1707,16 @@ void Widget::OnNativeWidgetParentChanged(gfx::NativeView parent) {
|
@@ -1704,10 +1715,16 @@ void Widget::OnNativeWidgetParentChanged(gfx::NativeView parent) {
|
||||||
}
|
}
|
||||||
|
|
||||||
gfx::Size Widget::GetMinimumSize() const {
|
gfx::Size Widget::GetMinimumSize() const {
|
||||||
@@ -589,7 +589,7 @@ index f2f1f54c474cf..2feb6a47c04e1 100644
|
|||||||
return non_client_view_ ? non_client_view_->GetMaximumSize() : gfx::Size();
|
return non_client_view_ ? non_client_view_->GetMaximumSize() : gfx::Size();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1950,7 +1967,8 @@ bool Widget::SetInitialFocus(ui::WindowShowState show_state) {
|
@@ -1958,7 +1975,8 @@ bool Widget::SetInitialFocus(ui::WindowShowState show_state) {
|
||||||
return false;
|
return false;
|
||||||
View* v = widget_delegate_->GetInitiallyFocusedView();
|
View* v = widget_delegate_->GetInitiallyFocusedView();
|
||||||
if (!focus_on_creation_ || show_state == ui::SHOW_STATE_INACTIVE ||
|
if (!focus_on_creation_ || show_state == ui::SHOW_STATE_INACTIVE ||
|
||||||
|
Reference in New Issue
Block a user