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

Unified Diff: ui/views/widget/widget.cc

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: move lifetime comment 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 | « ui/views/widget/widget.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/widget.cc
diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc
index 895b5e1f903b56962e21e3e428dde0ff3184f7b7..88a68dad587ba9335b3ceeff9c14a641e6b1f2f5 100644
--- a/ui/views/widget/widget.cc
+++ b/ui/views/widget/widget.cc
@@ -129,7 +129,6 @@ Widget::InitParams::InitParams(Type type)
show_state(ui::SHOW_STATE_DEFAULT),
parent(nullptr),
native_widget(nullptr),
- native_theme(nullptr),
desktop_window_tree_host(nullptr),
layer_type(ui::LAYER_TEXTURED),
context(nullptr),
@@ -145,7 +144,6 @@ Widget::InitParams::~InitParams() {
Widget::Widget()
: native_widget_(nullptr),
- native_theme_(nullptr),
widget_delegate_(nullptr),
non_client_view_(nullptr),
dragged_view_(nullptr),
@@ -346,7 +344,6 @@ void Widget::Init(const InitParams& in_params) {
internal::NativeWidgetPrivate::IsMouseButtonDown();
}
native_widget_->InitNativeWidget(params);
- native_theme_ = params.native_theme;
if (RequiresNonClientView(params.type)) {
non_client_view_ = new NonClientView;
non_client_view_->SetFrameView(CreateNonClientFrameView());
@@ -751,7 +748,7 @@ const ui::ThemeProvider* Widget::GetThemeProvider() const {
}
const ui::NativeTheme* Widget::GetNativeTheme() const {
- return native_theme_? native_theme_ : native_widget_->GetNativeTheme();
+ return native_widget_->GetNativeTheme();
}
FocusManager* Widget::GetFocusManager() {
« no previous file with comments | « ui/views/widget/widget.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698