Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(351)

Unified Diff: chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc

Issue 1581473002: Remove base/win/metro.{cc|h} and some associated code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixes Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..ce273c0a9fe33ef50a7c777cfe78cf7bef12695a 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.

Powered by Google App Engine
This is Rietveld 408576698