-
-
Notifications
You must be signed in to change notification settings - Fork 179
/
Copy paththorium-2024-ui.patch
5042 lines (4718 loc) · 210 KB
/
thorium-2024-ui.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff --git a/base/BUILD.gn b/base/BUILD.gn
index 9247e9b3f4c92..eacd7f76564df 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -1085,6 +1085,7 @@ component("base") {
"//build:chromecast_buildflags",
"//build:chromeos_buildflags",
"//third_party/abseil-cpp:absl",
+ "//ui/base:buildflags",
]
if (build_rust_base_conversions) {
@@ -2532,6 +2533,7 @@ buildflag_header("debugging_buildflags") {
"ENABLE_ALLOCATION_STACK_TRACE_RECORDER=$build_allocation_stack_trace_recorder",
"ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=$build_allocation_trace_recorder_full_reporting",
"PRINT_UNSYMBOLIZED_STACK_TRACES=$print_unsymbolized_stack_traces",
+ "THORIUM_DEBUG=$thorium_debug",
]
}
diff --git a/base/check.cc b/base/check.cc
index bd63d5a88e34e..1bed253cb50ee 100644
--- a/base/check.cc
+++ b/base/check.cc
@@ -323,6 +323,7 @@ std::ostream& CheckError::stream() {
}
CheckError::~CheckError() {
+#if !BUILDFLAG(THORIUM_DEBUG)
// TODO(crbug.com/40254046): Consider splitting out CHECK from DCHECK so that
// the destructor can be marked [[noreturn]] and we don't need to check
// severity in the destructor.
@@ -340,6 +341,7 @@ CheckError::~CheckError() {
if (is_fatal) {
base::ImmediateCrash();
}
+#endif // !BUILDFLAG(THORIUM_DEBUG)
}
CheckError::CheckError(LogMessage* log_message) : log_message_(log_message) {}
diff --git a/base/debug/debug.gni b/base/debug/debug.gni
index 1d236d210a16f..b5059c81559ec 100644
--- a/base/debug/debug.gni
+++ b/base/debug/debug.gni
@@ -26,6 +26,13 @@ declare_args() {
# Even if it's disabled we still collect some data, i.e. total number of
# allocations. All other data will be set to a default value.
build_allocation_trace_recorder_full_reporting = false
+
+ # A special build flag for the Thorium debug builds.
+ #
+ # This enables stack traces in logs and non-fatalizes DCHECKs.
+ # Ultimately, it should help users collect necessary data for browser issues
+ # without setting up a dedicated debugger.
+ thorium_debug = is_debug
}
assert(!(build_allocation_stack_trace_recorder && is_fuchsia),
diff --git a/base/files/file_util_win.cc b/base/files/file_util_win.cc
index 7cda11126e61e..fe82b35a1a5d1 100644
--- a/base/files/file_util_win.cc
+++ b/base/files/file_util_win.cc
@@ -883,8 +883,9 @@ bool IsLink(const FilePath& file_path) {
}
bool GetFileInfo(const FilePath& file_path, File::Info* results) {
+#if !BUILDFLAG(THORIUM_DEBUG)
ScopedBlockingCall scoped_blocking_call(FROM_HERE, BlockingType::MAY_BLOCK);
-
+#endif // !BUILDFLAG(THORIUM_DEBUG)
WIN32_FILE_ATTRIBUTE_DATA attr;
if (!GetFileAttributesEx(file_path.value().c_str(), GetFileExInfoStandard,
&attr)) {
diff --git a/base/logging.cc b/base/logging.cc
index 0d93ca4713624..3815fe60b4776 100644
--- a/base/logging.cc
+++ b/base/logging.cc
@@ -8,6 +8,7 @@
#endif
#include "base/logging.h"
+#include "base/environment.h"
#ifdef BASE_CHECK_H_
#error "logging.h should not include check.h"
@@ -62,6 +63,7 @@
#include "build/chromeos_buildflags.h"
#include "third_party/abseil-cpp/absl/base/internal/raw_logging.h"
#include "third_party/abseil-cpp/absl/cleanup/cleanup.h"
+#include "ui/base/ui_base_features.h"
#if !BUILDFLAG(IS_NACL)
#include "base/auto_reset.h"
@@ -457,6 +459,7 @@ void WriteToFd(int fd, const char* data, size_t length) {
}
}
+#if !BUILDFLAG(THORIUM_DEBUG)
void SetLogFatalCrashKey(LogMessage* log_message) {
#if !BUILDFLAG(IS_NACL)
// In case of an out-of-memory condition, this code could be reentered when
@@ -477,6 +480,7 @@ void SetLogFatalCrashKey(LogMessage* log_message) {
#endif // !BUILDFLAG(IS_NACL)
}
+#endif // !BUILDFLAG(THORIUM_DEBUG)
std::string BuildCrashString(const char* file,
int line,
@@ -585,9 +589,24 @@ int GetMinLogLevel() {
return g_min_log_level;
}
+bool IsVerbose() {
+ const char* const env = getenv("THORIUM_DEBUG");
+ const std::string_view env_str =
+ env ? std::string_view(env) : std::string_view();
+ if (env_str == "1" || env_str == "true") {
+ return true;
+ } else {
+ return false;
+ }
+}
+
bool ShouldCreateLogMessage(int severity) {
- if (severity < g_min_log_level)
+ if (severity < g_min_log_level) {
return false;
+ }
+ if (IsVerbose()) {
+ return true;
+ }
// Return true here unless we know ~LogMessage won't do anything.
return g_logging_destination != LOG_NONE || g_log_message_handler ||
@@ -599,8 +618,12 @@ bool ShouldCreateLogMessage(int severity) {
// set, or only LOG_TO_FILE is set, since that is useful for local development
// and debugging.
bool ShouldLogToStderr(int severity) {
- if (g_logging_destination & LOG_TO_STDERR)
+ if (g_logging_destination & LOG_TO_STDERR) {
+ return true;
+ }
+ if (IsVerbose()) {
return true;
+ }
#if BUILDFLAG(IS_FUCHSIA)
// Fuchsia will persist data logged to stdio by a component, so do not emit
@@ -731,9 +754,11 @@ void LogMessage::Flush() {
// Don't let actions from this method affect the system error after returning.
base::ScopedClearLastError scoped_clear_last_error;
+#if !BUILDFLAG(THORIUM_DEBUG)
size_t stack_start = stream_.str().length();
+#endif // !BUILDFLAG(THORIUM_DEBUG)
#if !defined(OFFICIAL_BUILD) && !BUILDFLAG(IS_NACL) && !defined(__UCLIBC__) && \
- !BUILDFLAG(IS_AIX)
+ !BUILDFLAG(IS_AIX) || BUILDFLAG(THORIUM_DEBUG)
// Include a stack trace on a fatal, unless a debugger is attached.
if (severity_ == LOGGING_FATAL && !base::debug::BeingDebugged()) {
base::debug::StackTrace stack_trace;
@@ -766,6 +791,7 @@ void LogMessage::Flush() {
std::string str_newline(stream_.str());
TraceLogMessage(file_, line_, str_newline.substr(message_start_));
+#if !BUILDFLAG(THORIUM_DEBUG)
// FATAL messages should always run the assert handler and crash, even if a
// message handler marks them as otherwise handled.
absl::Cleanup handle_fatal_message = [&] {
@@ -776,6 +802,7 @@ void LogMessage::Flush() {
if (severity_ == LOGGING_FATAL)
SetLogFatalCrashKey(this);
+#endif // !BUILDFLAG(THORIUM_DEBUG)
// Give any log message handler first dibs on the message.
if (g_log_message_handler &&
diff --git a/base/logging.h b/base/logging.h
index fe2ce670da340..82bbda21a16e5 100644
--- a/base/logging.h
+++ b/base/logging.h
@@ -301,6 +301,9 @@ BASE_EXPORT void SetMinLogLevel(int level);
// Gets the current log level.
BASE_EXPORT int GetMinLogLevel();
+// Whether to always log in verbose mode
+BASE_EXPORT bool IsVerbose();
+
// Used by LOG_IS_ON to lazy-evaluate stream arguments.
BASE_EXPORT bool ShouldCreateLogMessage(int severity);
diff --git a/chrome/browser/extensions/api/messaging/launch_context_win.cc b/chrome/browser/extensions/api/messaging/launch_context_win.cc
index b103bbe61303d..469611cb36e7a 100644
--- a/chrome/browser/extensions/api/messaging/launch_context_win.cc
+++ b/chrome/browser/extensions/api/messaging/launch_context_win.cc
@@ -62,7 +62,7 @@ bool GetManifestPathWithFlags(HKEY root_key,
std::wstring* result) {
#if BUILDFLAG(CHROMIUM_BRANDING)
static constexpr wchar_t kChromiumNativeMessagingRegistryKey[] =
- L"SOFTWARE\\Chromium\\NativeMessagingHosts";
+ L"SOFTWARE\\Thorium\\NativeMessagingHosts";
// Try to read the path using the Chromium-specific registry for Chromium.
// If that fails, fallback to Chrome-specific registry key below.
diff --git a/chrome/browser/resources/downloads/item.css b/chrome/browser/resources/downloads/item.css
index f5c2357c5c986..86f18f7c77f8a 100644
--- a/chrome/browser/resources/downloads/item.css
+++ b/chrome/browser/resources/downloads/item.css
@@ -322,7 +322,7 @@ cr-button {
--cr-icon-button-icon-size: 20px;
--cr-icon-button-margin-end: 0;
--cr-icon-button-margin-start: 0;
- gap: 12px;
+ gap: 6px;
margin-top: 12px;
margin-inline-start: 12px;
margin-inline-end: 12px;
diff --git a/chrome/browser/resources/downloads/item.html.ts b/chrome/browser/resources/downloads/item.html.ts
index 1e0f2c895d708..64347e17d7e42 100644
--- a/chrome/browser/resources/downloads/item.html.ts
+++ b/chrome/browser/resources/downloads/item.html.ts
@@ -47,7 +47,7 @@ export function getHtml(this: DownloadsItemElement) {
?hidden="${!this.shouldShowReferrerUrl_()}">
<!-- Text populated dynamically -->
</div>
- <a id="url" ?hidden="${this.showReferrerUrl_}" target="_blank"
+ <a id="url" target="_blank"
@click="${this.onUrlClick_}" focus-row-control
focus-type="url">${this.getDisplayUrlStr_()}</a>
</div>
@@ -94,7 +94,6 @@ export function getHtml(this: DownloadsItemElement) {
focus-row-control focus-type="copyDownloadLink">
</cr-icon-button>
<cr-icon-button id="more-actions" iron-icon="cr:more-vert"
- ?hidden="${!this.computeShowActionMenu_()}"
class="dropdown-trigger" title="$i18n{moreActions}"
@click="${this.onMoreActionsClick_}" aria-haspopup="menu"
focus-row-control focus-type="actionMenuButton">
diff --git a/chrome/browser/resources/pdf/manifest.json b/chrome/browser/resources/pdf/manifest.json
index f355f92ac2f37..e0b69081164fd 100644
--- a/chrome/browser/resources/pdf/manifest.json
+++ b/chrome/browser/resources/pdf/manifest.json
@@ -3,8 +3,8 @@
"manifest_version": 2,
"key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDN6hM0rsDYGbzQPQfOygqlRtQgKUXMfnSjhIBL7LnReAVBEd7ZmKtyN2qmSasMl4HZpMhVe2rPWVVwBDl6iyNE/Kok6E6v6V3vCLGsOpQAuuNVye/3QxzIldzG/jQAdWZiyXReRVapOhZtLjGfywCvlWq7Sl/e3sbc0vWybSDI2QIDAQAB",
"name": "<NAME>",
- "version": "1",
- "description": "",
+ "version": "1.0.1",
+ "description": "Internal Component Extension for rendering PDFs.",
"offline_enabled": true,
"incognito": "split",
"permissions": [
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index bc6e4008f2c5a..9b6dffa76b9dc 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -182,6 +182,7 @@ static_library("ui") {
"tab_modal_confirm_dialog.h",
"tab_ui_helper.cc",
"tab_ui_helper.h",
+ "thorium_2024.h",
"toolbar/chrome_labs/chrome_labs_model.cc",
"toolbar/chrome_labs/chrome_labs_model.h",
"toolbar/chrome_labs/chrome_labs_prefs.cc",
@@ -4430,6 +4431,8 @@ static_library("ui") {
"views/frame/top_container_view.cc",
"views/frame/top_container_view.h",
"views/frame/top_controls_slide_controller.h",
+ "views/frame/window_caption_util.cc",
+ "views/frame/window_caption_util.h",
"views/frame/web_contents_close_handler.cc",
"views/frame/web_contents_close_handler.h",
"views/frame/web_contents_close_handler_delegate.h",
diff --git a/chrome/browser/ui/bookmarks/bookmark_utils.cc b/chrome/browser/ui/bookmarks/bookmark_utils.cc
index e7858be996ca8..c8dd78eab4df0 100644
--- a/chrome/browser/ui/bookmarks/bookmark_utils.cc
+++ b/chrome/browser/ui/bookmarks/bookmark_utils.cc
@@ -7,6 +7,7 @@
#include <stddef.h>
#include "base/check.h"
+#include "base/command_line.h"
#include "base/feature_list.h"
#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
@@ -292,9 +293,13 @@ gfx::ImageSkia GetBookmarkFolderImageFromVectorIcon(
const gfx::VectorIcon* id;
gfx::ImageSkia folder;
if (icon_type == BookmarkFolderIconType::kNormal) {
- id = &vector_icons::kFolderChromeRefreshIcon;
+ id = features::IsThorium2024()
+ ? &vector_icons::kFolderIcon
+ : &vector_icons::kFolderChromeRefreshIcon;
} else {
- id = &vector_icons::kFolderManagedRefreshIcon;
+ id = features::IsThorium2024()
+ ? &vector_icons::kFolderManagedIcon
+ : &vector_icons::kFolderManagedRefreshIcon;
}
const ui::ThemedVectorIcon icon =
absl::holds_alternative<SkColor>(color)
@@ -318,8 +323,45 @@ ui::ImageModel GetBookmarkFolderIcon(
absl::variant<ui::ColorId, SkColor> color,
const ui::ColorProvider* color_provider) {
gfx::ImageSkia folder;
- folder =
- GetBookmarkFolderImageFromVectorIcon(icon_type, color, color_provider);
+ if (!features::IsThorium2024()) {
+ folder = GetBookmarkFolderImageFromVectorIcon(icon_type, color,
+ color_provider);
+ } else {
+#if BUILDFLAG(IS_WIN)
+ // TODO(bsep): vectorize the Windows versions: crbug.com/564112
+ folder = *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+ default_id);
+#elif BUILDFLAG(IS_MAC)
+ SkColor sk_color;
+ if (absl::holds_alternative<SkColor>(color)) {
+ sk_color = absl::get<SkColor>(color);
+ } else {
+ DCHECK(color_provider);
+ sk_color = color_provider->GetColor(absl::get<ui::ColorId>(color));
+ }
+ const int white_id = (icon_type == BookmarkFolderIconType::kNormal)
+ ? IDR_FOLDER_CLOSED_WHITE
+ : IDR_BOOKMARK_BAR_FOLDER_MANAGED_WHITE;
+ const int resource_id =
+ color_utils::IsDark(sk_color) ? default_id : white_id;
+ folder = *ui::ResourceBundle::GetSharedInstance()
+ .GetNativeImageNamed(resource_id)
+ .ToImageSkia();
+#elif BUILDFLAG(IS_LINUX)
+ const bool classic_bookmarks =
+ base::CommandLine::ForCurrentProcess()->HasSwitch("classic-bookmarks");
+ if (classic_bookmarks) {
+ folder = *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+ default_id);
+ } else {
+ folder = GetBookmarkFolderImageFromVectorIcon(icon_type, color,
+ color_provider);
+ }
+#else
+ folder = GetBookmarkFolderImageFromVectorIcon(icon_type, color,
+ color_provider);
+#endif
+ }
return gfx::ImageSkia(std::make_unique<RTLFlipSource>(folder),
folder.size());
};
diff --git a/chrome/browser/ui/bookmarks/bookmark_utils_desktop.cc b/chrome/browser/ui/bookmarks/bookmark_utils_desktop.cc
index 64948595a4bc6..a568c893736ca 100644
--- a/chrome/browser/ui/bookmarks/bookmark_utils_desktop.cc
+++ b/chrome/browser/ui/bookmarks/bookmark_utils_desktop.cc
@@ -47,7 +47,7 @@ using bookmarks::BookmarkNode;
namespace chrome {
-size_t kNumBookmarkUrlsBeforePrompting = 15;
+size_t kNumBookmarkUrlsBeforePrompting = 50;
static BookmarkNavigationWrapper* g_nav_wrapper_test_instance = nullptr;
diff --git a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.cc b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.cc
index 71f9d6ad07da0..246532a09797a 100644
--- a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.cc
+++ b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.cc
@@ -133,10 +133,6 @@ std::optional<size_t> RecentlyUsedFoldersComboModel::GetDefaultIndex() const {
// TODO(pbos): Look at returning -1 here if there's no default index. Right
// now a lot of code in Combobox assumes an index within `items_` bounds.
auto it = base::ranges::find(items_, Item(parent_node_, Item::TYPE_NODE));
- if (it == items_.end()) {
- it = base::ranges::find(items_,
- Item(parent_node_, Item::TYPE_ALL_BOOKMARKS_NODE));
- }
return it == items_.end() ? 0 : static_cast<int>(it - items_.begin());
}
diff --git a/chrome/browser/ui/browser_actions.cc b/chrome/browser/ui/browser_actions.cc
index d65691f1aa1a5..da4fff1f928f7 100644
--- a/chrome/browser/ui/browser_actions.cc
+++ b/chrome/browser/ui/browser_actions.cc
@@ -9,6 +9,7 @@
#include <string>
#include "base/check_op.h"
+#include "base/command_line.h"
#include "chrome/app/vector_icons/vector_icons.h"
#include "chrome/browser/devtools/devtools_window.h"
#include "chrome/browser/profiles/profile.h"
@@ -410,6 +411,8 @@ void BrowserActions::InitializeBrowserActions() {
if (IsChromeLabsEnabled()) {
// TODO(b/354758327): Update `ShouldShowChromeLabsUI()` to not require
// `model` as a parameter, then use to set visibility of action item.
+ static const bool disable_thorium_icons =
+ base::CommandLine::ForCurrentProcess()->HasSwitch("disable-thorium-icons");
root_action_item_->AddChild(
ChromeMenuAction(base::BindRepeating(
[](Browser* browser, actions::ActionItem* item,
@@ -418,7 +421,9 @@ void BrowserActions::InitializeBrowserActions() {
},
base::Unretained(browser)),
kActionShowChromeLabs, IDS_CHROMELABS,
- IDS_CHROMELABS, kScienceIcon)
+ IDS_CHROMELABS, disable_thorium_icons
+ ? kScienceIcon
+ : kScienceThoriumIcon)
.SetVisible(false)
.Build());
}
diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc
index 86af74569f013..1f9cc1696eda4 100644
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -1423,7 +1423,8 @@ void BrowserCommandController::InitCommandState() {
command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS,
normal_window);
- const bool enable_tab_search_commands = browser_->is_type_normal();
+ const bool enable_tab_search_commands = browser_->is_type_normal() &&
+ !base::CommandLine::ForCurrentProcess()->HasSwitch("remove-tabsearch-button");
command_updater_.UpdateCommandEnabled(IDC_TAB_SEARCH,
enable_tab_search_commands);
command_updater_.UpdateCommandEnabled(IDC_TAB_SEARCH_CLOSE,
diff --git a/chrome/browser/ui/color/chrome_color_mixer.cc b/chrome/browser/ui/color/chrome_color_mixer.cc
index 589c77c52175b..28e662fdd8e2f 100644
--- a/chrome/browser/ui/color/chrome_color_mixer.cc
+++ b/chrome/browser/ui/color/chrome_color_mixer.cc
@@ -141,8 +141,7 @@ void AddChromeColorMixer(ui::ColorProvider* provider,
gfx::kGoogleGrey500, kColorBookmarkBarBackground, 6.0f);
mixer[kColorBookmarkFolderIcon] = {ui::kColorIcon};
mixer[kColorBookmarkBarSeparator] = {kColorToolbarSeparator};
- mixer[kColorBookmarkBarSeparatorChromeRefresh] = {
- kColorTabBackgroundInactiveFrameActive};
+ mixer[kColorBookmarkBarSeparatorChromeRefresh] = {ui::kColorSysDivider};
mixer[kColorBookmarkDragImageBackground] = {ui::kColorAccent};
mixer[kColorBookmarkDragImageCountBackground] = {ui::kColorAlertHighSeverity};
mixer[kColorBookmarkDragImageCountForeground] =
@@ -748,8 +747,7 @@ void AddChromeColorMixer(ui::ColorProvider* provider,
ui::SetAlpha(kColorToolbarInkDrop, std::ceil(0.06f * 255.0f));
mixer[kColorAppMenuChipInkDropHover] = {kColorToolbarInkDropHover};
mixer[kColorAppMenuChipInkDropRipple] = {kColorToolbarInkDropRipple};
- mixer[kColorToolbarExtensionSeparatorEnabled] = {
- kColorTabBackgroundInactiveFrameActive};
+ mixer[kColorToolbarExtensionSeparatorEnabled] = {ui::kColorSysDivider};
mixer[kColorToolbarExtensionSeparatorDisabled] = {
kColorToolbarButtonIconInactive};
mixer[kColorToolbarSeparator] = {kColorToolbarSeparatorDefault};
diff --git a/chrome/browser/ui/color/chrome_color_mixers.cc b/chrome/browser/ui/color/chrome_color_mixers.cc
index 9698e807b11df..8bb6a245caeba 100644
--- a/chrome/browser/ui/color/chrome_color_mixers.cc
+++ b/chrome/browser/ui/color/chrome_color_mixers.cc
@@ -22,6 +22,7 @@
#include "chrome/browser/ui/color/omnibox_color_mixer.h"
#include "chrome/browser/ui/color/product_specifications_color_mixer.h"
#include "chrome/browser/ui/color/tab_strip_color_mixer.h"
+#include "ui/base/ui_base_features.h"
#include "ui/color/color_provider_utils.h"
namespace {
@@ -59,20 +60,38 @@ void AddChromeColorMixers(ui::ColorProvider* provider,
chrome_color_provider_utils_callbacks;
ui::SetColorProviderUtilsCallbacks(
chrome_color_provider_utils_callbacks.get());
- AddChromeColorMixer(provider, key);
- AddNewTabPageColorMixer(provider, key);
- AddOmniboxColorMixer(provider, key);
- AddProductSpecificationsColorMixer(provider, key);
- AddTabStripColorMixer(provider, key);
-
- AddMaterialChromeColorMixer(provider, key);
- AddMaterialNewTabPageColorMixer(provider, key);
- AddMaterialOmniboxColorMixer(provider, key);
- AddMaterialSidePanelColorMixer(provider, key);
- AddMaterialTabStripColorMixer(provider, key);
-
- // Must be the last one in order to override other mixer colors.
- AddNativeChromeColorMixer(provider, key);
+
+ if (features::IsThorium2024()) {
+ AddMaterialChromeColorMixer(provider, key);
+ AddMaterialNewTabPageColorMixer(provider, key);
+ AddMaterialOmniboxColorMixer(provider, key);
+ AddMaterialSidePanelColorMixer(provider, key);
+ AddMaterialTabStripColorMixer(provider, key);
+
+ AddChromeColorMixer(provider, key);
+ AddNewTabPageColorMixer(provider, key);
+ AddOmniboxColorMixer(provider, key);
+ AddProductSpecificationsColorMixer(provider, key);
+ AddTabStripColorMixer(provider, key);
+
+ // Must be the last one in order to override other mixer colors.
+ AddNativeChromeColorMixer(provider, key);
+ } else {
+ AddChromeColorMixer(provider, key);
+ AddNewTabPageColorMixer(provider, key);
+ AddOmniboxColorMixer(provider, key);
+ AddProductSpecificationsColorMixer(provider, key);
+ AddTabStripColorMixer(provider, key);
+
+ AddMaterialChromeColorMixer(provider, key);
+ AddMaterialNewTabPageColorMixer(provider, key);
+ AddMaterialOmniboxColorMixer(provider, key);
+ AddMaterialSidePanelColorMixer(provider, key);
+ AddMaterialTabStripColorMixer(provider, key);
+
+ // Must be the last one in order to override other mixer colors.
+ AddNativeChromeColorMixer(provider, key);
+ }
if (key.custom_theme) {
key.custom_theme->AddColorMixers(provider, key);
diff --git a/chrome/browser/ui/color/tab_strip_color_mixer.cc b/chrome/browser/ui/color/tab_strip_color_mixer.cc
index 9faa599b47cc1..d683ac878cb0e 100644
--- a/chrome/browser/ui/color/tab_strip_color_mixer.cc
+++ b/chrome/browser/ui/color/tab_strip_color_mixer.cc
@@ -136,10 +136,7 @@ void AddTabStripColorMixer(ui::ColorProvider* provider,
// behavior. The main difference is that the tab hover color in GM2 depends on
// the tab width - narrower tabs have more opacity. We must chooses a single
// opacity, so we go with one towards the more opaque end of the GM2 range.
- mixer[kColorTabBackgroundInactiveHoverFrameActive] = {
- ui::AlphaBlend(kColorTabBackgroundActiveFrameActive,
- kColorTabBackgroundInactiveFrameActive,
- /* 40% opacity */ 0.4 * SK_AlphaOPAQUE)};
+ mixer[kColorTabBackgroundInactiveHoverFrameActive] = {ui::kColorSysStateHeaderHover};
mixer[kColorTabBackgroundInactiveHoverFrameInactive] = {
ui::AlphaBlend(kColorTabBackgroundActiveFrameInactive,
kColorTabBackgroundInactiveFrameInactive,
diff --git a/chrome/browser/ui/frame/window_frame_util.h b/chrome/browser/ui/frame/window_frame_util.h
index e4ccd7fab5421..0eadd6bdd8def 100644
--- a/chrome/browser/ui/frame/window_frame_util.h
+++ b/chrome/browser/ui/frame/window_frame_util.h
@@ -11,6 +11,8 @@ namespace gfx {
class Size;
}
+class Browser;
+
// Static-only class containing values and helper functions for frame classes
// that need to be accessible outside of /browser/ui/views.
class WindowFrameUtil {
diff --git a/chrome/browser/ui/layout_constants.cc b/chrome/browser/ui/layout_constants.cc
index 87c4ee64068a6..d900607d59819 100644
--- a/chrome/browser/ui/layout_constants.cc
+++ b/chrome/browser/ui/layout_constants.cc
@@ -7,6 +7,7 @@
#include "base/feature_list.h"
#include "base/notreached.h"
#include "build/build_config.h"
+#include "chrome/browser/ui/thorium_2024.h"
#include "chrome/browser/ui/tabs/features.h"
#include "chrome/browser/ui/ui_features.h"
#include "components/omnibox/common/omnibox_features.h"
@@ -20,24 +21,31 @@
int GetLayoutConstant(LayoutConstant constant) {
const bool touch_ui = ui::TouchUiController::Get()->touch_ui();
+ static const bool classic_omnibox =
+ base::CommandLine::ForCurrentProcess()->HasSwitch("classic-omnibox");
switch (constant) {
case APP_MENU_PROFILE_ROW_AVATAR_ICON_SIZE:
- return 24;
+ return features::IsThorium2024() ? 16 : 24;
case APP_MENU_MAXIMUM_CHARACTER_LENGTH:
- return 30;
+ return features::IsThorium2024() ? 28 : 30;
case BOOKMARK_BAR_HEIGHT: {
// The fixed margin ensures the bookmark buttons appear centered relative
// to the white space above and below.
- const int bookmark_bar_attached_vertical_margin = 6;
+ const int bookmark_bar_attached_vertical_margin = features::IsThorium2024() ? 3 : 6;
return GetLayoutConstant(BOOKMARK_BAR_BUTTON_HEIGHT) +
bookmark_bar_attached_vertical_margin;
}
- case BOOKMARK_BAR_BUTTON_HEIGHT:
- return touch_ui ? 36 : 28;
+ case BOOKMARK_BAR_BUTTON_HEIGHT: {
+ if (features::IsThorium2024()) {
+ return touch_ui ? 34 : 26;
+ } else {
+ return touch_ui ? 36 : 28;
+ }
+ }
case BOOKMARK_BAR_BUTTON_PADDING:
- return GetLayoutConstant(TOOLBAR_ELEMENT_PADDING);
+ return features::IsThorium2024() ? 2 : GetLayoutConstant(TOOLBAR_ELEMENT_PADDING);
case BOOKMARK_BAR_BUTTON_IMAGE_LABEL_PADDING:
- return 6;
+ return features::IsThorium2024() ? 6 : 6;
case WEB_APP_MENU_BUTTON_SIZE:
return 24;
case WEB_APP_PAGE_ACTION_ICON_SIZE:
@@ -51,7 +59,7 @@ int GetLayoutConstant(LayoutConstant constant) {
case LOCATION_BAR_CHILD_INTERIOR_PADDING:
return 3;
case LOCATION_BAR_CHILD_CORNER_RADIUS:
- return 12;
+ return classic_omnibox ? 4 : 12;
case LOCATION_BAR_CHIP_ICON_SIZE:
return 16;
case LOCATION_BAR_CHIP_PADDING:
@@ -59,41 +67,69 @@ int GetLayoutConstant(LayoutConstant constant) {
case LOCATION_BAR_ELEMENT_PADDING:
return touch_ui ? 3 : 2;
case LOCATION_BAR_PAGE_INFO_ICON_VERTICAL_PADDING:
- return touch_ui ? 3 : 5;
+ if (features::IsThorium2024()) {
+ return touch_ui ? 3 : 4;
+ } else {
+ return touch_ui ? 3 : 5;
+ }
case LOCATION_BAR_LEADING_DECORATION_EDGE_PADDING:
// TODO(manukh): See comment in `LocationBarView::Layout()`. We have too
// many feature permutations that would affect this and other layout
// constants, so instead of spreading the permutation logic here and
// elsewhere, it's consolidated in `Layout()` and will be moved back
// here once we decide on a permutation.
- NOTREACHED();
+ if (features::IsThorium2024()) {
+ return touch_ui ? 3 : 4;
+ } else {
+ return touch_ui ? 3 : 5;
+ }
case LOCATION_BAR_TRAILING_DECORATION_EDGE_PADDING:
- return touch_ui ? 3 : 12;
+ if (features::IsThorium2024()) {
+ return touch_ui ? 3 : 6;
+ } else {
+ return touch_ui ? 3 : 12;
+ }
case LOCATION_BAR_TRAILING_DECORATION_INNER_PADDING:
- return touch_ui ? 3 : 8;
+ if (features::IsThorium2024()) {
+ return touch_ui ? 3 : 6;
+ } else {
+ return touch_ui ? 3 : 8;
+ }
case LOCATION_BAR_HEIGHT:
- return touch_ui ? 36 : 34;
+ if (features::IsThorium2024()) {
+ return touch_ui ? 34 : 30;
+ } else {
+ return touch_ui ? 36 : 34;
+ }
case LOCATION_BAR_ICON_SIZE:
return touch_ui ? 20 : 16;
case LOCATION_BAR_LEADING_ICON_SIZE:
return GetLayoutConstant(LOCATION_BAR_ICON_SIZE);
case LOCATION_BAR_TRAILING_ICON_SIZE:
- return 20;
+ return features::IsThorium2024() ? 20 : 20;
case TAB_AFTER_TITLE_PADDING:
return touch_ui ? 8 : 4;
case TAB_ALERT_INDICATOR_CAPTURE_ICON_WIDTH:
return 16;
case TAB_ALERT_INDICATOR_ICON_WIDTH:
return touch_ui ? 12 : 16;
+ case TAB_BUTTON_OFFSET:
+ return features::IsThorium2024() ? -1 : 0;
case TAB_CLOSE_BUTTON_SIZE:
- return touch_ui ? 24 : 16;
+ return touch_ui ? 24 : 18;
case TAB_HEIGHT:
return 34 + GetLayoutConstant(TABSTRIP_TOOLBAR_OVERLAP);
case TAB_STRIP_HEIGHT:
return GetLayoutConstant(TAB_HEIGHT) +
GetLayoutConstant(TAB_STRIP_PADDING);
case TAB_STRIP_PADDING:
- return 6;
+ return features::IsThorium2024() ? 0 : 6;
+ case TAB_MARGIN:
+ return features::IsThorium2024() ? 6 : 6;
+ case TAB_INACTIVE_PADDING:
+ return features::IsThorium2024() ? 3 : 6;
+ case TAB_SEARCH_PADDING:
+ return features::IsThorium2024() ? 3 : 6;
case TAB_SEPARATOR_HEIGHT:
return touch_ui ? 24 : 20;
case TAB_PRE_TITLE_PADDING:
@@ -108,27 +144,43 @@ int GetLayoutConstant(LayoutConstant constant) {
}
return 1;
case TOOLBAR_BUTTON_HEIGHT:
- return touch_ui ? 48 : 34;
+ if (features::IsThorium2024()) {
+ return touch_ui ? 46 : 30;
+ } else {
+ return touch_ui ? 48 : 34;
+ }
case TOOLBAR_DIVIDER_CORNER_RADIUS:
- return 1;
+ return 1.0f;
case TOOLBAR_DIVIDER_HEIGHT:
- return touch_ui ? 20 : 16;
+ if (features::IsThorium2024()) {
+ return touch_ui ? 20 : 18;
+ } else {
+ return touch_ui ? 20 : 16;
+ }
case TOOLBAR_DIVIDER_SPACING:
- return 9;
+ return features::IsThorium2024() ? 7 : 9;
case TOOLBAR_DIVIDER_WIDTH:
return 2;
case TOOLBAR_ELEMENT_PADDING:
return touch_ui ? 0 : 4;
case TOOLBAR_ICON_DEFAULT_MARGIN:
- return touch_ui ? 0 : 2;
+ if (features::IsThorium2024()) {
+ return touch_ui ? 2 : 2;
+ } else {
+ return touch_ui ? 0 : 2;
+ }
case TOOLBAR_STANDARD_SPACING:
- return touch_ui ? 12 : 9;
+ if (features::IsThorium2024()) {
+ return touch_ui ? 12 : 7;
+ } else {
+ return touch_ui ? 12 : 9;
+ }
case PAGE_INFO_ICON_SIZE:
- return 20;
+ return features::IsThorium2024() ? 18 : 20;
case DOWNLOAD_ICON_SIZE:
- return 20;
+ return features::IsThorium2024() ? 18 : 20;
case TOOLBAR_CORNER_RADIUS:
- return 8;
+ return 0;
default:
break;
}
@@ -143,10 +195,14 @@ gfx::Insets GetLayoutInsets(LayoutInset inset) {
return gfx::Insets(4);
case DOWNLOAD_ROW:
- return gfx::Insets::VH(8, 20);
+ return gfx::Insets::VH(8, features::IsThorium2024() ? 18 : 20);
case LOCATION_BAR_ICON_INTERIOR_PADDING:
- return gfx::Insets::VH(2, 2);
+ if (features::IsThorium2024()) {
+ return touch_ui ? gfx::Insets::VH(5, 10) : gfx::Insets::VH(4, 4);
+ } else {
+ return touch_ui ? gfx::Insets::VH(2, 4) : gfx::Insets::VH(2, 2);
+ }
case LOCATION_BAR_PAGE_INFO_ICON_PADDING:
return touch_ui ? gfx::Insets::VH(5, 10) : gfx::Insets::VH(4, 4);
@@ -161,27 +217,36 @@ gfx::Insets GetLayoutInsets(LayoutInset inset) {
}
case TOOLBAR_BUTTON:
- return gfx::Insets(touch_ui ? 12 : 7);
+ return gfx::Insets(touch_ui ? 12
+ : (features::IsThorium2024() ? 6 : 7));
case BROWSER_APP_MENU_CHIP_PADDING:
- if (touch_ui) {
+ if (touch_ui || features::IsThorium2024()) {
return GetLayoutInsets(TOOLBAR_BUTTON);
} else {
return gfx::Insets::TLBR(7, 4, 7, 6);
}
case AVATAR_CHIP_PADDING:
- if (touch_ui) {
+ if (touch_ui || features::IsThorium2024()) {
return GetLayoutInsets(TOOLBAR_BUTTON);
} else {
return gfx::Insets::TLBR(7, 10, 7, 4);
}
case TOOLBAR_INTERIOR_MARGIN:
- return touch_ui ? gfx::Insets() : gfx::Insets::VH(6, 5);
+ if (features::IsThorium2024()) {
+ return touch_ui ? gfx::Insets() : gfx::Insets::VH(3, 6);
+ } else {
+ return touch_ui ? gfx::Insets() : gfx::Insets::VH(6, 5);
+ }
case WEBUI_TAB_STRIP_TOOLBAR_INTERIOR_MARGIN:
- return gfx::Insets::VH(4, 0);
+ if (features::IsThorium2024()) {
+ return gfx::Insets::VH(4, 6);
+ } else {
+ return gfx::Insets::VH(4, 0);
+ }
}
NOTREACHED_IN_MIGRATION();
return gfx::Insets();
diff --git a/chrome/browser/ui/layout_constants.h b/chrome/browser/ui/layout_constants.h
index a35795ee8cc11..60577ba01a5fd 100644
--- a/chrome/browser/ui/layout_constants.h
+++ b/chrome/browser/ui/layout_constants.h
@@ -123,9 +123,21 @@ enum LayoutConstant {
// detached tab, and on all sides of the controls padding.
TAB_STRIP_PADDING,
+ // For the tab margins
+ TAB_MARGIN,
+
+ // For inactive tab padding
+ TAB_INACTIVE_PADDING,
+
// The height of a separator in the tabstrip.
TAB_SEPARATOR_HEIGHT,
+ // Padding for the tab search button
+ TAB_SEARCH_PADDING,
+
+ // Offset y for new tab button
+ TAB_BUTTON_OFFSET,
+
// Padding before the tab title.
TAB_PRE_TITLE_PADDING,
diff --git a/chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc b/chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc
index 3ae6b02a62d64..63ef3fc6483fb 100644
--- a/chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc
+++ b/chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc
@@ -12,6 +12,7 @@
#include "build/chromeos_buildflags.h"
#include "chrome/browser/shell_integration.h"
#include "chrome/common/chrome_features.h"
+#include "chrome/common/thorium_2024.h"
#include "chrome/common/webui_url_constants.h"
#include "components/omnibox/browser/actions/omnibox_pedal.h"
#include "components/omnibox/browser/autocomplete_input.h"
@@ -1972,14 +1973,18 @@ class OmniboxPedalSetChromeAsDefaultBrowser : public OmniboxPedal {
// =============================================================================
const gfx::VectorIcon& GetSharingHubVectorIcon() {
+ const bool thorium_2024 = features::IsThorium2024();
#if BUILDFLAG(IS_MAC)
return omnibox::kShareMacChromeRefreshIcon;
#elif BUILDFLAG(IS_WIN)
- return omnibox::kShareWinChromeRefreshIcon;
+ return thorium_2024 ? omnibox::kShareChromeRefreshIcon
+ : omnibox::kShareWinChromeRefreshIcon;
#elif BUILDFLAG(IS_LINUX)
- return omnibox::kShareLinuxChromeRefreshIcon;
+ return thorium_2024 ? omnibox::kShareChromeRefreshIcon
+ : omnibox::kShareLinuxChromeRefreshIcon;
#else
- return omnibox::kShareChromeRefreshIcon;
+ return thorium_2024 ? omnibox::kShareIcon
+ : omnibox::kShareChromeRefreshIcon;
#endif
}
diff --git a/chrome/browser/ui/status_bubble.h b/chrome/browser/ui/status_bubble.h
index 74a00df155806..c8e4a81911d80 100644
--- a/chrome/browser/ui/status_bubble.h
+++ b/chrome/browser/ui/status_bubble.h
@@ -18,7 +18,7 @@ class GURL;
class StatusBubble {
public:
// On hover, expand status bubble to fit long URL after this delay.
- static const int kExpandHoverDelayMS = 1600;
+ static const int kExpandHoverDelayMS = 1;
virtual ~StatusBubble() {}
diff --git a/chrome/browser/ui/tabs/tab_menu_model.cc b/chrome/browser/ui/tabs/tab_menu_model.cc
index fba81d1815359..88415257b897c 100644
--- a/chrome/browser/ui/tabs/tab_menu_model.cc
+++ b/chrome/browser/ui/tabs/tab_menu_model.cc
@@ -105,6 +105,10 @@ void TabMenuModel::Build(TabStripModel* tab_strip, int index) {
AddItemWithStringId(TabStripModel::CommandNewTabToRight,
base::i18n::IsRTL() ? IDS_TAB_CXMENU_NEWTABTOLEFT
: IDS_TAB_CXMENU_NEWTABTORIGHT);
+ AddItemWithStringId(TabStripModel::CommandNewTabToLeft,
+ base::i18n::IsRTL() ? IDS_TAB_CXMENU_NEWTABTORIGHT
+ : IDS_TAB_CXMENU_NEWTABTOLEFT);
+ //AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB);
if (tab_strip->delegate()->SupportsReadLater()) {
AddItem(
TabStripModel::CommandAddToReadLater,
diff --git a/chrome/browser/ui/tabs/tab_strip_model.cc b/chrome/browser/ui/tabs/tab_strip_model.cc
index 91513d4488166..4fa0ac198e9c6 100644
--- a/chrome/browser/ui/tabs/tab_strip_model.cc
+++ b/chrome/browser/ui/tabs/tab_strip_model.cc
@@ -1298,6 +1298,7 @@ bool TabStripModel::IsContextMenuCommandEnabled(
ContextMenuCommand command_id) const {
DCHECK(command_id > CommandFirst && command_id < CommandLast);
switch (command_id) {
+ case CommandNewTabToLeft:
case CommandNewTabToRight:
case CommandCloseTab:
return true;
@@ -1399,6 +1400,16 @@ void TabStripModel::ExecuteContextMenuCommand(int context_index,
if (!ContainsIndex(context_index))
return;
switch (command_id) {
+
+ case CommandNewTabToLeft: {
+ base::RecordAction(UserMetricsAction("TabContextMenu_NewTab"));
+ UMA_HISTOGRAM_ENUMERATION("Tab.NewTab", NewTabTypes::NEW_TAB_CONTEXT_MENU,
+ NewTabTypes::NEW_TAB_ENUM_COUNT);
+ delegate()->AddTabAt(GURL(), context_index, true,
+ GetTabGroupForTab(context_index));
+ break;
+ }
+
case CommandNewTabToRight: {
base::RecordAction(UserMetricsAction("TabContextMenu_NewTab"));
UMA_HISTOGRAM_ENUMERATION("Tab.NewTab", NewTabTypes::NEW_TAB_CONTEXT_MENU,
diff --git a/chrome/browser/ui/tabs/tab_strip_model.h b/chrome/browser/ui/tabs/tab_strip_model.h
index 4d900c4a7f58c..8daa4634abeaf 100644
--- a/chrome/browser/ui/tabs/tab_strip_model.h
+++ b/chrome/browser/ui/tabs/tab_strip_model.h
@@ -545,6 +545,7 @@ class TabStripModel : public TabGroupController {
// for entries in the 'Add to existing group' submenu.
enum ContextMenuCommand {
CommandFirst,
+ CommandNewTabToLeft,
CommandNewTabToRight,
CommandReload,
CommandDuplicate,
diff --git a/chrome/browser/ui/tabs/tab_style.cc b/chrome/browser/ui/tabs/tab_style.cc
index d48223986946d..9e5df278ea2b6 100644
--- a/chrome/browser/ui/tabs/tab_style.cc
+++ b/chrome/browser/ui/tabs/tab_style.cc
@@ -11,6 +11,7 @@
#include "chrome/browser/ui/layout_constants.h"
#include "chrome/browser/ui/tabs/features.h"
+#include "chrome/browser/ui/thorium_2024.h"
#include "chrome/browser/ui/ui_features.h"
#include "ui/base/ui_base_features.h"
#include "ui/color/color_provider.h"
@@ -21,13 +22,18 @@ namespace {
// Thickness in DIPs of the separator painted on the left and right edges of
// the tab.
+constexpr int kThoriumSeparatorThickness = 2;
constexpr int kChromeRefreshSeparatorThickness = 2;
+constexpr float kThoriumSeparatorHorizontalMargin = 0.0f;
constexpr int kChromeRefreshSeparatorHorizontalMargin = 2;
// TODO (crbug.com/1451400): This constant should be in LayoutConstants.
+constexpr int kThoriumSeparatorHeight = 20;
constexpr int kChromeRefreshSeparatorHeight = 16;
// The padding from the top of the tab to the content area.
+constexpr int kThoriumTabVerticalPadding = 9;
constexpr int kChromeRefreshTabVerticalPadding = 6;
+constexpr int kThoriumTabHorizontalPadding = 6;
constexpr int kChromeRefreshTabHorizontalPadding = 8;
class ChromeRefresh2023TabStyle : public TabStyle {
@@ -59,8 +65,28 @@ class ChromeRefresh2023TabStyle : public TabStyle {
TabStyle::~TabStyle() = default;
int ChromeRefresh2023TabStyle::GetStandardWidth() const {
+
+ const std::string custom_tab_width = base::CommandLine::ForCurrentProcess()->
+ GetSwitchValueASCII("custom-tab-width");
+ int kTabWidthValue;
+ if (custom_tab_width == "60") {
+ kTabWidthValue = 60;
+ } else if (custom_tab_width == "120") {
+ kTabWidthValue = 120;
+ } else if (custom_tab_width == "180") {
+ kTabWidthValue = 180;
+ } else if (custom_tab_width == "240") {
+ kTabWidthValue = 240;
+ } else if (custom_tab_width == "300") {
+ kTabWidthValue = 300;
+ } else if (custom_tab_width == "400") {
+ kTabWidthValue = 400;
+ } else {
+ kTabWidthValue = 240;
+ }
+
// The standard tab width is 240 DIP including both separators.
- constexpr int kTabWidth = 240;
+ const int kTabWidth = kTabWidthValue;
// The overlap includes one separator, so subtract it here.
return kTabWidth + GetTabOverlap() - GetSeparatorSize().width();
}
@@ -107,19 +133,42 @@ int ChromeRefresh2023TabStyle::GetMinimumInactiveWidth() const {
}
int ChromeRefresh2023TabStyle::GetTopCornerRadius() const {
- return 10;
+ static const bool rectangular_tabs =
+ base::CommandLine::ForCurrentProcess()->HasSwitch("rectangular-tabs");
+ if (features::IsThorium2024() && !rectangular_tabs) {
+ return 8;
+ } else if ((rectangular_tabs && features::IsThorium2024()) || (rectangular_tabs && !features::IsThorium2024())) {
+ return 4;
+ } else {
+ return 10;
+ }
}
int ChromeRefresh2023TabStyle::GetBottomCornerRadius() const {