chrome/browser/ui/views/frame/browser_view.h - Issue 1637203002: [MD] Don't use new OTR native-theming when using a custom browser theme.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/frame/browser_view.h

Issue 1637203002: [MD] Don't use new OTR native-theming when using a custom browser theme. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: todo done Created 4 years, 11 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

« no previous file with comments | « chrome/browser/ui/views/frame/browser_frame.cc ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | chrome/browser/ui/views/theme_copying_widget.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/frame/browser_view.h

diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h

index 7995bca0c215b6bad51c635e96372fe317386631..df2055e1e7fe374badcd3403e84282cbc454faf6 100644

--- a/chrome/browser/ui/views/frame/browser_view.h

+++ b/chrome/browser/ui/views/frame/browser_view.h

@@ -445,6 +445,7 @@ class BrowserView : public BrowserWindow,

const ViewHierarchyChangedDetails& details) override;

void ChildPreferredSizeChanged(View* child) override;

void GetAccessibleState(ui::AXViewState* state) override;

+ void OnThemeChanged() override;

void OnNativeThemeChanged(const ui::NativeTheme* theme) override;

// Overridden from ui::AcceleratorTarget:

@@ -670,6 +671,10 @@ class BrowserView : public BrowserWindow,

// True if we have already been initialized.

bool initialized_;

+ // True if we're currently handling a theme change (i.e. inside

+ // OnThemeChanged()).

+ bool handling_theme_changed_;

// True when in ProcessFullscreen(). The flag is used to avoid reentrance and

// to ignore requests to layout while in ProcessFullscreen() to reduce

// jankiness.