chrome/browser/chromeos/chrome_browser_main_chromeos.cc - Issue 12438016: Save display preference when all display configuration changes has been completed.

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.cc

Issue 12438016: Save display preference when all display configuration changes has been completed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: replace dcheck Created 7 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/chrome_browser_main_chromeos.h ('k') | chrome/browser/chromeos/display/display_configuration_observer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

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

index c4820152ee484faa299de48c1fd50b731ce5beca..78686aa305cdbddbd6c7d263f9cc47bfc22d404c 100644

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

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

@@ -29,8 +29,8 @@

#include "chrome/browser/chromeos/contacts/contact_manager.h"

#include "chrome/browser/chromeos/cros/cros_library.h"

#include "chrome/browser/chromeos/dbus/cros_dbus_service.h"

+#include "chrome/browser/chromeos/display/display_configuration_observer.h"

#include "chrome/browser/chromeos/display/display_preferences.h"

-#include "chrome/browser/chromeos/display/primary_display_switch_observer.h"

#include "chrome/browser/chromeos/extensions/default_app_order.h"

#include "chrome/browser/chromeos/external_metrics.h"

#include "chrome/browser/chromeos/imageburner/burn_manager.h"

@@ -630,8 +630,8 @@ void ChromeBrowserMainPartsChromeos::PostProfileInit() {

NotifyDisplayLocalStatePrefChanged();

- primary_display_switch_observer_.reset(

- new PrimaryDisplaySwitchObserver());

+ display_configuration_observer_.reset(

+ new DisplayConfigurationObserver());

ChromeBrowserMainPartsLinux::PostProfileInit();

}

@@ -727,7 +727,7 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {

// before the shell is destroyed.

user_activity_notifier_.reset();

video_activity_notifier_.reset();

- primary_display_switch_observer_.reset();

+ display_configuration_observer_.reset();

// Detach D-Bus clients before DBusThreadManager is shut down.

power_button_observer_.reset();