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

Side by Side Diff: components/wallpaper/wallpaper_manager_base.h

Issue 2315303002: Remove calls to IsRunningSequenceOnCurrentThread() in wallpaper API. (Closed)
Patch Set: Leaky LazyInstance Created 4 years, 3 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef COMPONENTS_WALLPAPER_WALLPAPER_MANAGER_BASE_H_ 5 #ifndef COMPONENTS_WALLPAPER_WALLPAPER_MANAGER_BASE_H_
6 #define COMPONENTS_WALLPAPER_WALLPAPER_MANAGER_BASE_H_ 6 #define COMPONENTS_WALLPAPER_WALLPAPER_MANAGER_BASE_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <deque> 10 #include <deque>
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 std::string location; 73 std::string location;
74 WallpaperLayout layout; 74 WallpaperLayout layout;
75 user_manager::User::WallpaperType type; 75 user_manager::User::WallpaperType type;
76 base::Time date; 76 base::Time date;
77 bool operator==(const WallpaperInfo& other) { 77 bool operator==(const WallpaperInfo& other) {
78 return (location == other.location) && (layout == other.layout) && 78 return (location == other.location) && (layout == other.layout) &&
79 (type == other.type); 79 (type == other.type);
80 } 80 }
81 }; 81 };
82 82
83 // Asserts that the current task is sequenced with any other task that calls
84 // this.
85 void WALLPAPER_EXPORT AssertCalledOnWallpaperSequence();
86
83 class WallpaperManagerBrowserTest; 87 class WallpaperManagerBrowserTest;
84 88
85 // Name of wallpaper sequence token. 89 // Name of wallpaper sequence token.
86 WALLPAPER_EXPORT extern const char kWallpaperSequenceTokenName[]; 90 WALLPAPER_EXPORT extern const char kWallpaperSequenceTokenName[];
87 91
88 // File path suffices of resized small or large wallpaper. 92 // File path suffices of resized small or large wallpaper.
89 // TODO(bshe): Use the same sub folder system as custom wallpapers use. 93 // TODO(bshe): Use the same sub folder system as custom wallpapers use.
90 // crbug.com/174928 94 // crbug.com/174928
91 WALLPAPER_EXPORT extern const char kSmallWallpaperSuffix[]; 95 WALLPAPER_EXPORT extern const char kSmallWallpaperSuffix[];
92 WALLPAPER_EXPORT extern const char kLargeWallpaperSuffix[]; 96 WALLPAPER_EXPORT extern const char kLargeWallpaperSuffix[];
(...skipping 511 matching lines...) Expand 10 before | Expand all | Expand 10 after
604 608
605 base::WeakPtrFactory<WallpaperManagerBase> weak_factory_; 609 base::WeakPtrFactory<WallpaperManagerBase> weak_factory_;
606 610
607 private: 611 private:
608 DISALLOW_COPY_AND_ASSIGN(WallpaperManagerBase); 612 DISALLOW_COPY_AND_ASSIGN(WallpaperManagerBase);
609 }; 613 };
610 614
611 } // namespace wallpaper 615 } // namespace wallpaper
612 616
613 #endif // COMPONENTS_WALLPAPER_WALLPAPER_MANAGER_BASE_H_ 617 #endif // COMPONENTS_WALLPAPER_WALLPAPER_MANAGER_BASE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698