diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-22 00:26:16 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-22 00:26:16 +0000 |
| commit | 7d07d699c79980d9f881bddd2991d9606e3b6aca (patch) | |
| tree | 0ffddf055f750f5e4b4cd0a46bd283bbc35d0e0f | |
| parent | 2e195f5938e632d3cd7874848d5143d189f37f39 (diff) | |
| download | chromium_src-7d07d699c79980d9f881bddd2991d9606e3b6aca.zip chromium_src-7d07d699c79980d9f881bddd2991d9606e3b6aca.tar.gz chromium_src-7d07d699c79980d9f881bddd2991d9606e3b6aca.tar.bz2 | |
Dont overwrite default display layout if it's given by command line flag.
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10962021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158142 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ash/display/display_controller.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ash/display/display_controller.cc b/ash/display/display_controller.cc index d87252d..b7361c3 100644 --- a/ash/display/display_controller.cc +++ b/ash/display/display_controller.cc @@ -297,8 +297,10 @@ DisplayController::GetAllRootWindowControllers() { } void DisplayController::SetDefaultDisplayLayout(const DisplayLayout& layout) { - if (default_display_layout_.position != layout.position || - default_display_layout_.offset != layout.offset) { + CommandLine* command_line = CommandLine::ForCurrentProcess(); + if (!command_line->HasSwitch(switches::kAshSecondaryDisplayLayout) && + (default_display_layout_.position != layout.position || + default_display_layout_.offset != layout.offset)) { default_display_layout_ = layout; NotifyDisplayConfigurationChanging(); UpdateDisplayBoundsForLayout(); |