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

Side by Side Diff: chrome/browser/chromeos/extensions/wallpaper_private_api.cc

Issue 2200893002: mash: Partially migrate ash/desktop_background to ash common types. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix mash browser test crash in GetMaxDisplaySizeInNative. Created 4 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/extensions/wallpaper_private_api.h" 5 #include "chrome/browser/chromeos/extensions/wallpaper_private_api.h"
6 6
7 #include <map> 7 #include <map>
8 #include <memory> 8 #include <memory>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
11 #include <utility> 11 #include <utility>
12 #include <vector> 12 #include <vector>
13 13
14 #include "ash/aura/wm_window_aura.h" 14 #include "ash/aura/wm_window_aura.h"
15 #include "ash/common/wm/mru_window_tracker.h" 15 #include "ash/common/wm/mru_window_tracker.h"
16 #include "ash/common/wm/window_state.h" 16 #include "ash/common/wm/window_state.h"
17 #include "ash/common/wm_shell.h" 17 #include "ash/common/wm_shell.h"
18 #include "ash/desktop_background/desktop_background_controller.h"
19 #include "ash/shell.h" 18 #include "ash/shell.h"
20 #include "ash/wm/window_state_aura.h" 19 #include "ash/wm/window_state_aura.h"
21 #include "ash/wm/window_util.h" 20 #include "ash/wm/window_util.h"
22 #include "base/command_line.h" 21 #include "base/command_line.h"
23 #include "base/files/file_enumerator.h" 22 #include "base/files/file_enumerator.h"
24 #include "base/files/file_util.h" 23 #include "base/files/file_util.h"
25 #include "base/macros.h" 24 #include "base/macros.h"
26 #include "base/memory/ptr_util.h" 25 #include "base/memory/ptr_util.h"
27 #include "base/memory/ref_counted_memory.h" 26 #include "base/memory/ref_counted_memory.h"
28 #include "base/metrics/histogram_macros.h" 27 #include "base/metrics/histogram_macros.h"
(...skipping 946 matching lines...) Expand 10 before | Expand all | Expand 10 after
975 bool WallpaperPrivateRecordWallpaperUMAFunction::RunSync() { 974 bool WallpaperPrivateRecordWallpaperUMAFunction::RunSync() {
976 std::unique_ptr<record_wallpaper_uma::Params> params( 975 std::unique_ptr<record_wallpaper_uma::Params> params(
977 record_wallpaper_uma::Params::Create(*args_)); 976 record_wallpaper_uma::Params::Create(*args_));
978 EXTENSION_FUNCTION_VALIDATE(params); 977 EXTENSION_FUNCTION_VALIDATE(params);
979 978
980 user_manager::User::WallpaperType source = getWallpaperType(params->source); 979 user_manager::User::WallpaperType source = getWallpaperType(params->source);
981 UMA_HISTOGRAM_ENUMERATION("Ash.Wallpaper.Source", source, 980 UMA_HISTOGRAM_ENUMERATION("Ash.Wallpaper.Source", source,
982 user_manager::User::WALLPAPER_TYPE_COUNT); 981 user_manager::User::WALLPAPER_TYPE_COUNT);
983 return true; 982 return true;
984 } 983 }
OLDNEW
« no previous file with comments | « ash/test/ui_controls_factory_ash.cc ('k') | chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698