diff options
| author | estade <estade@chromium.org> | 2016-01-27 19:24:41 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-28 03:25:39 +0000 |
| commit | 426c9fcce7a81e6e20dac1d4b2cc6fcda7aab510 (patch) | |
| tree | 8a17267d17a164c206a9f9688a5269d7d4c4ba2d /chrome/chrome_browser_ui.gypi | |
| parent | 2a5da822dd88c4eb3c538c134fd4b81f1207b8fb (diff) | |
| download | chromium_src-426c9fcce7a81e6e20dac1d4b2cc6fcda7aab510.zip chromium_src-426c9fcce7a81e6e20dac1d4b2cc6fcda7aab510.tar.gz chromium_src-426c9fcce7a81e6e20dac1d4b2cc6fcda7aab510.tar.bz2 | |
[MD] Don't use new OTR native-theming when using a custom browser theme.
The location bar, omnibox, and find in page bar should look the same in
incognito and normal windows if we're using a custom theme. Since
changing to or from a custom theme can now affect the window's decision
of which NativeTheme to use, we have to make GetNativeTheme()
overrideable as well as propagate NativeTheme changes when the browser
theme changes.
BUG=581559
depends on http://crrev.com/1638063003#ps1
Review URL: https://codereview.chromium.org/1637203002
Cr-Commit-Position: refs/heads/master@{#371990}
Diffstat (limited to 'chrome/chrome_browser_ui.gypi')
| -rw-r--r-- | chrome/chrome_browser_ui.gypi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi index 088af29..b8891a8 100644 --- a/chrome/chrome_browser_ui.gypi +++ b/chrome/chrome_browser_ui.gypi @@ -2442,6 +2442,8 @@ 'browser/ui/views/tabs/window_finder_mac.mm', 'browser/ui/views/tabs/window_finder_win.cc', 'browser/ui/views/task_manager_view.cc', + 'browser/ui/views/theme_copying_widget.cc', + 'browser/ui/views/theme_copying_widget.h', 'browser/ui/views/toolbar/app_menu.cc', 'browser/ui/views/toolbar/app_menu.h', 'browser/ui/views/toolbar/app_menu_button.cc', |