diff options
Diffstat (limited to 'chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc')
-rw-r--r-- | chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc | 21 |
1 files changed, 0 insertions, 21 deletions
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 eaa1ec6..ce273c0 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 @@ -12,7 +12,6 @@ #include "base/threading/sequenced_worker_pool.h" #include "chrome/browser/apps/per_app_settings_service.h" #include "chrome/browser/apps/per_app_settings_service_factory.h" -#include "chrome/browser/metro_utils/metro_chrome_win.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/shell_integration.h" #include "chrome/browser/ui/views/apps/app_window_desktop_native_widget_aura_win.h" @@ -39,16 +38,6 @@ ChromeNativeAppWindowViewsWin::ChromeNativeAppWindowViewsWin() ChromeNativeAppWindowViewsWin::~ChromeNativeAppWindowViewsWin() { } -void ChromeNativeAppWindowViewsWin::ActivateParentDesktopIfNecessary() { - // Only switching into Ash from Native is supported. Tearing the user out of - // Metro mode can only be done by launching a process from Metro mode itself. - // This is done for launching apps, but not regular activations. - if (IsRunningInAsh() && - chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_NATIVE) { - chrome::ActivateMetroChrome(); - } -} - HWND ChromeNativeAppWindowViewsWin::GetNativeAppWindowHWND() const { return views::HWNDForWidget(widget()->GetTopLevelWidget()); } @@ -149,16 +138,6 @@ ChromeNativeAppWindowViewsWin::CreateStandardDesktopAppFrame() { return ChromeNativeAppWindowViewsAura::CreateStandardDesktopAppFrame(); } -void ChromeNativeAppWindowViewsWin::Show() { - ActivateParentDesktopIfNecessary(); - ChromeNativeAppWindowViewsAura::Show(); -} - -void ChromeNativeAppWindowViewsWin::Activate() { - ActivateParentDesktopIfNecessary(); - ChromeNativeAppWindowViewsAura::Activate(); -} - bool ChromeNativeAppWindowViewsWin::CanMinimize() const { // Resizing on Windows breaks translucency if the window also has shape. // See http://crbug.com/417947. |