Index: chrome/browser/chromeos/extensions/wallpaper_private_api.cc |
diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc |
index 62a1d75d8401b4a70e4a21cdebe2402aeb22a19c..37d1cd87b8f49e241498dde0a08006db829d4ed2 100644 |
--- a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc |
+++ b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc |
@@ -33,6 +33,7 @@ |
#include "chrome/browser/chromeos/profiles/profile_helper.h" |
#include "chrome/browser/profiles/profile.h" |
#include "chrome/browser/sync/profile_sync_service_factory.h" |
+#include "chrome/browser/ui/ash/ash_util.h" |
#include "chrome/common/chrome_paths.h" |
#include "chrome/common/pref_names.h" |
#include "chrome/grit/generated_resources.h" |
@@ -170,6 +171,11 @@ WindowStateManager* g_window_state_manager = NULL; |
// static |
void WindowStateManager::MinimizeInactiveWindows( |
const std::string& user_id_hash) { |
+ if (chrome::IsRunningInMash()) { |
+ NOTIMPLEMENTED(); |
+ return; |
+ } |
+ |
if (!g_window_state_manager) |
g_window_state_manager = new WindowStateManager(); |
g_window_state_manager->BuildWindowListAndMinimizeInactiveForUser( |
@@ -178,6 +184,11 @@ void WindowStateManager::MinimizeInactiveWindows( |
// static |
void WindowStateManager::RestoreWindows(const std::string& user_id_hash) { |
+ if (chrome::IsRunningInMash()) { |
+ NOTIMPLEMENTED(); |
+ return; |
+ } |
+ |
if (!g_window_state_manager) { |
DCHECK(false) << "This should only be called after calling " |
<< "MinimizeInactiveWindows."; |