Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(125)

Unified Diff: chrome/browser/ui/cocoa/tabs/tab_strip_view.mm

Issue 2404783002: [Mac] Avoid "adding unknown subview" warning. (Closed)
Patch Set: Merged with head Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/tabs/tab_strip_view.mm
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_view.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_view.mm
index 279c36d8aee7d7fd907084f509a1addea63f703b..a59f02047d4c99a1d3a8210c2b2066c704e47433 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_view.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_view.mm
@@ -13,6 +13,7 @@
#include "chrome/browser/themes/theme_properties.h"
#include "chrome/browser/themes/theme_service.h"
#import "chrome/browser/ui/cocoa/browser_window_controller.h"
+#import "chrome/browser/ui/cocoa/browser_window_layout.h"
#import "chrome/browser/ui/cocoa/new_tab_button.h"
#import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
#import "chrome/browser/ui/cocoa/tabs/tab_view.h"
@@ -351,7 +352,11 @@
if (!base::mac::IsAtLeastOS10_10())
return nil;
- NSView* rootView = [[[self window] contentView] superview];
+ NSView* rootView = [[self window] contentView];
+ if (!chrome::ShouldUseFullSizeContentView()) {
+ rootView = [rootView superview];
+ }
+
Class nsVisualEffectViewClass = NSClassFromString(@"NSVisualEffectView");
DCHECK(nsVisualEffectViewClass);
for (NSView* view in [rootView subviews]) {

Powered by Google App Engine
This is Rietveld 408576698