mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 135.0.7049.96
This commit is contained in:
committed by
Marshall Greenblatt
parent
e7de5c3d91
commit
d008a99a60
@@ -7,5 +7,5 @@
|
|||||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||||
|
|
||||||
{
|
{
|
||||||
'chromium_checkout': 'refs/tags/135.0.7049.85'
|
'chromium_checkout': 'refs/tags/135.0.7049.96'
|
||||||
}
|
}
|
||||||
|
@@ -1059,7 +1059,7 @@ index 98d97b84906bd..d63bab08e8098 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
diff --git chrome/browser/ui/views/toolbar/toolbar_view.cc chrome/browser/ui/views/toolbar/toolbar_view.cc
|
diff --git chrome/browser/ui/views/toolbar/toolbar_view.cc chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||||
index f5ca2195a1784..bd4aa99b00427 100644
|
index fd5dcdf1f352f..44c30ba50ef38 100644
|
||||||
--- chrome/browser/ui/views/toolbar/toolbar_view.cc
|
--- chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||||
+++ chrome/browser/ui/views/toolbar/toolbar_view.cc
|
+++ chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||||
@@ -185,7 +185,7 @@ class TabstripLikeBackground : public views::Background {
|
@@ -185,7 +185,7 @@ class TabstripLikeBackground : public views::Background {
|
||||||
@@ -1127,7 +1127,7 @@ index f5ca2195a1784..bd4aa99b00427 100644
|
|||||||
!base::FeatureList::IsEnabled(features::kPinnableDownloadsButton)) {
|
!base::FeatureList::IsEnabled(features::kPinnableDownloadsButton)) {
|
||||||
download_button =
|
download_button =
|
||||||
std::make_unique<DownloadToolbarButtonView>(browser_view_);
|
std::make_unique<DownloadToolbarButtonView>(browser_view_);
|
||||||
@@ -368,7 +384,8 @@ void ToolbarView::Init() {
|
@@ -373,7 +389,8 @@ void ToolbarView::Init() {
|
||||||
}
|
}
|
||||||
std::unique_ptr<media_router::CastToolbarButton> cast;
|
std::unique_ptr<media_router::CastToolbarButton> cast;
|
||||||
if (!base::FeatureList::IsEnabled(features::kPinnedCastButton)) {
|
if (!base::FeatureList::IsEnabled(features::kPinnedCastButton)) {
|
||||||
@@ -1137,7 +1137,7 @@ index f5ca2195a1784..bd4aa99b00427 100644
|
|||||||
cast = media_router::CastToolbarButton::Create(browser_);
|
cast = media_router::CastToolbarButton::Create(browser_);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -382,7 +399,8 @@ void ToolbarView::Init() {
|
@@ -387,7 +404,8 @@ void ToolbarView::Init() {
|
||||||
|
|
||||||
std::unique_ptr<send_tab_to_self::SendTabToSelfToolbarIconView>
|
std::unique_ptr<send_tab_to_self::SendTabToSelfToolbarIconView>
|
||||||
send_tab_to_self_button;
|
send_tab_to_self_button;
|
||||||
@@ -1147,7 +1147,7 @@ index f5ca2195a1784..bd4aa99b00427 100644
|
|||||||
send_tab_to_self_button =
|
send_tab_to_self_button =
|
||||||
std::make_unique<send_tab_to_self::SendTabToSelfToolbarIconView>(
|
std::make_unique<send_tab_to_self::SendTabToSelfToolbarIconView>(
|
||||||
browser_view_);
|
browser_view_);
|
||||||
@@ -840,7 +858,8 @@ void ToolbarView::Layout(PassKey) {
|
@@ -845,7 +863,8 @@ void ToolbarView::Layout(PassKey) {
|
||||||
|
|
||||||
if (display_mode_ == DisplayMode::NORMAL) {
|
if (display_mode_ == DisplayMode::NORMAL) {
|
||||||
LayoutCommon();
|
LayoutCommon();
|
||||||
|
Reference in New Issue
Block a user