Merge Prevent DisplayPreferences from saving incorrect rotations.

chrome/browser/extensions/display_info_provider_chromeos.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/display_info_provider_chromeos.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "base/message_loop/message_loop_proxy.h"
@@ skipping 316 matching lines @@
     display_manager->SetOverscanInsets(display_id,
                                        gfx::Insets(info.overscan->top,
                                                    info.overscan->left,
                                                    info.overscan->bottom,
                                                    info.overscan->right));
   }
 
   // Process 'rotation' parameter.
   if (info.rotation) {
     display_manager->SetDisplayRotation(display_id,
-                                        DegreesToRotation(*info.rotation));
+                                        DegreesToRotation(*info.rotation),
+                                        gfx::Display::ROTATION_SOURCE_ACTIVE);
   }
 
   // Process new display origin parameters.
   gfx::Point new_bounds_origin = target.bounds().origin();
   if (info.bounds_origin_x)
     new_bounds_origin.set_x(*info.bounds_origin_x);
   if (info.bounds_origin_y)
     new_bounds_origin.set_y(*info.bounds_origin_y);
 
   if (new_bounds_origin != target.bounds().origin()) {
@@ skipping 36 matching lines @@
 gfx::Screen* DisplayInfoProviderChromeOS::GetActiveScreen() {
   return ash::Shell::GetScreen();
 }
 
 // static
 DisplayInfoProvider* DisplayInfoProvider::Create() {
   return new DisplayInfoProviderChromeOS();
 }
 
 }  // namespace extensions