chrome/browser/chromeos/chrome_browser_main_chromeos.h - Issue 9703031: Retry landing "Enable users change desktop background image from settings page in Chromeos Aura bui…

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

Unified Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.h

Issue 9703031: Retry landing "Enable users change desktop background image from settings page in Chromeos Aura bui… (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Merge to trunk Created 8 years, 9 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

« no previous file with comments | « chrome/browser/chromeos/background/desktop_background_observer.cc ('k') | chrome/browser/chromeos/chrome_browser_main_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.h

diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.h b/chrome/browser/chromeos/chrome_browser_main_chromeos.h

index 156dc58b20070bcbaa2331f19d60d242e948a1b1..765990b8d46ec2eb743174cebe9dd39de99886fc 100644

--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.h

+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.h

@@ -14,6 +14,10 @@ class ResumeObserver;

class ScreenLockObserver;

class SessionManagerObserver;

+#if defined(OS_CHROMEOS) && defined(USE_ASH)

+class DesktopBackgroundObserver;

+#endif

#if defined(USE_AURA)

class InitialBrowserWindowObserver;

class PowerButtonObserver;

@@ -47,6 +51,10 @@ class ChromeBrowserMainPartsChromeos : public ChromeBrowserMainPartsLinux {

scoped_ptr<chromeos::ScreenLockObserver> screen_lock_observer_;

scoped_ptr<chromeos::SessionManagerObserver> session_manager_observer_;

+#if defined(OS_CHROMEOS) && defined(USE_ASH)

+ scoped_ptr<chromeos::DesktopBackgroundObserver> desktop_background_observer_;

+#endif

#if defined(USE_AURA)

scoped_ptr<chromeos::InitialBrowserWindowObserver>

initial_browser_window_observer_;