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 eaa1ec6a0cf1a5665c8882206e45a62f4689536e..0290eef1cdcf251bf8a5a93e500cb52481b2c44d 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()); |
} |
@@ -150,12 +139,10 @@ ChromeNativeAppWindowViewsWin::CreateStandardDesktopAppFrame() { |
} |
void ChromeNativeAppWindowViewsWin::Show() { |
sky
2016/01/12 03:40:51
Can you remove the override of Show and Activate e
scottmg
2016/01/12 18:24:16
Done.
|
- ActivateParentDesktopIfNecessary(); |
ChromeNativeAppWindowViewsAura::Show(); |
} |
void ChromeNativeAppWindowViewsWin::Activate() { |
- ActivateParentDesktopIfNecessary(); |
ChromeNativeAppWindowViewsAura::Activate(); |
} |