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

Unified Diff: ui/views/widget/widget.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: 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 | « chrome/chrome_browser_ui.gypi ('k') | ui/views/widget/widget.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/widget.h
diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h
index 54c6d29c959ad5f4389247bc84fe1f0236c5979b..11778fd7fa08b36c781bf0ac093c5de0482ca1c7 100644
--- a/ui/views/widget/widget.h
+++ b/ui/views/widget/widget.h
@@ -241,8 +241,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
// When set, this value is used as the Widget's NativeWidget implementation.
// The Widget will not construct a default one. Default is NULL.
NativeWidget* native_widget;
- // If provided, sets the native theme for this widget.
- ui::NativeTheme* native_theme;
// Aura-only. Provides a DesktopWindowTreeHost implementation to use instead
// of the default one.
// TODO(beng): Figure out if there's a better way to expose this, e.g. get
@@ -564,7 +562,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
return const_cast<ui::NativeTheme*>(
const_cast<const Widget*>(this)->GetNativeTheme());
}
- const ui::NativeTheme* GetNativeTheme() const;
+ virtual const ui::NativeTheme* GetNativeTheme() const;
// Returns the FocusManager for this widget.
// Note that all widgets in a widget hierarchy share the same focus manager.
@@ -865,10 +863,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
internal::NativeWidgetPrivate* native_widget_;
- // If non-null, the native theme for this widget. Otherwise the native theme
- // comes from |native_widget_|.
- ui::NativeTheme* native_theme_;
-
base::ObserverList<WidgetObserver> observers_;
base::ObserverList<WidgetRemovalsObserver> removals_observers_;
« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | ui/views/widget/widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698