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

Unified Diff: chrome/browser/chromeos/extensions/wallpaper_private_api.cc

Issue 1984433002: Hook up Chrome's wallpaper picker for mash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix gyp builds; address Sadrul's comment. Created 4 years, 7 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/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 6e0f19be7c2df1bdf532af893a5833ba4d750da5..cca1d8bd61ab70e3b6ca5540cb8e21924f8b76c9 100644
--- a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
+++ b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
@@ -32,6 +32,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"
@@ -169,6 +170,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(
@@ -177,6 +183,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.";

Powered by Google App Engine
This is Rietveld 408576698