| Index: chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc
|
| diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc
|
| index 48f08ce114c9a69175db8b169bceb0f9f7d08c1e..503c82ea775f50987bfbda7a1977214ae5018dd2 100644
|
| --- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc
|
| +++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc
|
| @@ -110,7 +110,7 @@ void ChromeNativeAppWindowViewsWin::OnBeforeWidgetInit(
|
|
|
| void ChromeNativeAppWindowViewsWin::InitializeDefaultWindow(
|
| const extensions::AppWindow::CreateParams& create_params) {
|
| - ChromeNativeAppWindowViews::InitializeDefaultWindow(create_params);
|
| + ChromeNativeAppWindowViewsAura::InitializeDefaultWindow(create_params);
|
|
|
| // Remaining initialization is for Windows shell integration, which doesn't
|
| // apply to app windows in Ash.
|
| @@ -145,23 +145,23 @@ ChromeNativeAppWindowViewsWin::CreateStandardDesktopAppFrame() {
|
| glass_frame_view_ = new GlassAppWindowFrameViewWin(this, widget());
|
| return glass_frame_view_;
|
| }
|
| - return ChromeNativeAppWindowViews::CreateStandardDesktopAppFrame();
|
| + return ChromeNativeAppWindowViewsAura::CreateStandardDesktopAppFrame();
|
| }
|
|
|
| void ChromeNativeAppWindowViewsWin::Show() {
|
| ActivateParentDesktopIfNecessary();
|
| - ChromeNativeAppWindowViews::Show();
|
| + ChromeNativeAppWindowViewsAura::Show();
|
| }
|
|
|
| void ChromeNativeAppWindowViewsWin::Activate() {
|
| ActivateParentDesktopIfNecessary();
|
| - ChromeNativeAppWindowViews::Activate();
|
| + ChromeNativeAppWindowViewsAura::Activate();
|
| }
|
|
|
| bool ChromeNativeAppWindowViewsWin::CanMinimize() const {
|
| // Resizing on Windows breaks translucency if the window also has shape.
|
| // See http://crbug.com/417947.
|
| - return ChromeNativeAppWindowViews::CanMinimize() &&
|
| + return ChromeNativeAppWindowViewsAura::CanMinimize() &&
|
| !(WidgetHasHitTestMask() && is_translucent_);
|
| }
|
|
|
|
|