chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc - Issue 18640003: Updates some includes of chrome_notification_types.h

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc

Issue 18640003: Updates some includes of chrome_notification_types.h (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 7 years, 5 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/chromeos/audio/audio_pref_handler_impl.cc ('k') | chrome/browser/chromeos/boot_times_loader.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/background/ash_user_wallpaper_delegate.h"	5 #include "chrome/browser/chromeos/background/ash_user_wallpaper_delegate.h"

6	6

7 #include "ash/shell.h"	7 #include "ash/shell.h"

8 #include "ash/desktop_background/user_wallpaper_delegate.h"	8 #include "ash/desktop_background/user_wallpaper_delegate.h"

9 #include "ash/wm/window_animations.h"	9 #include "ash/wm/window_animations.h"

10 #include "base/command_line.h"	10 #include "base/command_line.h"

11 #include "base/logging.h"	11 #include "base/logging.h"

	12 #include "chrome/browser/chrome_notification_types.h"

12 #include "chrome/browser/chromeos/extensions/wallpaper_manager_util.h"	13 #include "chrome/browser/chromeos/extensions/wallpaper_manager_util.h"

13 #include "chrome/browser/chromeos/login/startup_utils.h"	14 #include "chrome/browser/chromeos/login/startup_utils.h"

14 #include "chrome/browser/chromeos/login/wallpaper_manager.h"	15 #include "chrome/browser/chromeos/login/wallpaper_manager.h"

15 #include "chrome/browser/chromeos/login/wizard_controller.h"	16 #include "chrome/browser/chromeos/login/wizard_controller.h"

16 #include "chrome/browser/profiles/profile_manager.h"	17 #include "chrome/browser/profiles/profile_manager.h"

17 #include "chrome/browser/ui/browser.h"	18 #include "chrome/browser/ui/browser.h"

18 #include "chrome/browser/ui/browser_finder.h"	19 #include "chrome/browser/ui/browser_finder.h"

19 #include "chrome/browser/ui/chrome_pages.h"	20 #include "chrome/browser/ui/chrome_pages.h"

20 #include "chrome/common/chrome_notification_types.h"

21 #include "chromeos/chromeos_switches.h"	21 #include "chromeos/chromeos_switches.h"

22 #include "chromeos/login/login_state.h"	22 #include "chromeos/login/login_state.h"

23 #include "content/public/browser/notification_service.h"	23 #include "content/public/browser/notification_service.h"

24	24

25 namespace chromeos {	25 namespace chromeos {

26	26

27 namespace {	27 namespace {

28	28

29 bool IsNormalWallpaperChange() {	29 bool IsNormalWallpaperChange() {

30 if (chromeos::LoginState::Get()->IsUserLoggedIn() \|\|	30 if (chromeos::LoginState::Get()->IsUserLoggedIn() \|\|

(...skipping 74 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
105 DISALLOW_COPY_AND_ASSIGN(UserWallpaperDelegate);	105 DISALLOW_COPY_AND_ASSIGN(UserWallpaperDelegate);

106 };	106 };

107	107

108 } // namespace	108 } // namespace

109	109

110 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() {	110 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() {

111 return new chromeos::UserWallpaperDelegate();	111 return new chromeos::UserWallpaperDelegate();

112 }	112 }

113	113

114 } // namespace chromeos	114 } // namespace chromeos

OLD	NEW