diff options
| author | bshe <bshe@chromium.org> | 2015-11-18 14:38:35 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-18 22:39:33 +0000 |
| commit | a1838dc89b879f5099ead5323e091f915cb89e9d (patch) | |
| tree | 0ce46eb726dd70afd5cad84d76a1000120de1acb | |
| parent | 1c15fc813aa3534443bba09275dfda9cf7dde6cd (diff) | |
| download | chromium_src-a1838dc89b879f5099ead5323e091f915cb89e9d.zip chromium_src-a1838dc89b879f5099ead5323e091f915cb89e9d.tar.gz chromium_src-a1838dc89b879f5099ead5323e091f915cb89e9d.tar.bz2 | |
Rename chrome_views_delegate_aura to chrome_views_delegate_ash
It looks like chrome_views_delegate_aura use ash_util.h, which only included
when ash=1. So rename the old file to chrome_views_delegate_ash
This is needed because Aura Android will set use_aura to
true but use_ash to false.
BUG=557285
Review URL: https://codereview.chromium.org/1451973002
Cr-Commit-Position: refs/heads/master@{#360430}
| -rw-r--r-- | chrome/browser/ui/views/chrome_views_delegate.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/ui/views/chrome_views_delegate_ash.cc (renamed from chrome/browser/ui/views/chrome_views_delegate_aura.cc) | 0 | ||||
| -rw-r--r-- | chrome/chrome_browser_ui.gypi | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/ui/views/chrome_views_delegate.cc b/chrome/browser/ui/views/chrome_views_delegate.cc index f7efbac..ef18a76 100644 --- a/chrome/browser/ui/views/chrome_views_delegate.cc +++ b/chrome/browser/ui/views/chrome_views_delegate.cc @@ -472,7 +472,7 @@ ChromeViewsDelegate::GetBlockingPoolTaskRunner() { return content::BrowserThread::GetBlockingPool(); } -#if !defined(USE_AURA) && !defined(USE_CHROMEOS) +#if !defined(USE_ASH) views::Widget::InitParams::WindowOpacity ChromeViewsDelegate::GetOpacityForInitParams( const views::Widget::InitParams& params) { diff --git a/chrome/browser/ui/views/chrome_views_delegate_aura.cc b/chrome/browser/ui/views/chrome_views_delegate_ash.cc index f2691c5..f2691c5 100644 --- a/chrome/browser/ui/views/chrome_views_delegate_aura.cc +++ b/chrome/browser/ui/views/chrome_views_delegate_ash.cc diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi index 3fca748..85f7522 100644 --- a/chrome/chrome_browser_ui.gypi +++ b/chrome/chrome_browser_ui.gypi @@ -630,6 +630,7 @@ 'browser/ui/ash/multi_user/multi_user_context_menu.h', 'browser/ui/ash/session_state_delegate_views.cc', 'browser/ui/ash/session_state_delegate_views.h', + 'browser/ui/views/chrome_views_delegate_ash.cc', ], # Ash + Views. 'chrome_browser_ui_ash_views_sources': [ @@ -691,7 +692,6 @@ 'chrome_browser_ui_aura_non_chromeos': [ 'browser/ui/aura/active_desktop_monitor.cc', 'browser/ui/aura/active_desktop_monitor.h', - 'browser/ui/views/chrome_views_delegate_aura.cc', 'browser/ui/views/frame/desktop_browser_frame_aura.cc', 'browser/ui/views/frame/desktop_browser_frame_aura.h', 'browser/ui/views/message_center/message_center_frame_view.cc', |