Cancel drag if display configuration changes.

ash/display/multi_display_manager.h

 // Copyright (c) 2012 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.
 
 #ifndef ASH_DISPLAY_MULTI_DISPLAY_MANAGER_H_
 #define ASH_DISPLAY_MULTI_DISPLAY_MANAGER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 20 matching lines @@
 // TODO(oshima): gfx::Screen needs to return translated coordinates
 // if the root window is translated. crbug.com/119268.
 class ASH_EXPORT MultiDisplayManager : public aura::DisplayManager,
                                        public aura::RootWindowObserver {
  public:
   MultiDisplayManager();
   virtual ~MultiDisplayManager();
 
   // Used to emulate display change when run in a desktop environment instead
   // of on a device.
-  static void AddRemoveDisplay();
   static void CycleDisplay();
   static void ToggleDisplayScale();
 
   // Detects the internal display's ID, and stores gfx::Display
   // in the cache, if any.
   void InitInternalDisplayInfo();
 
   bool UpdateWorkAreaOfDisplayNearestWindow(const aura::Window* window,
                                             const gfx::Insets& insets);
 
@@ skipping 22 matching lines @@
   // RootWindowObserver overrides:
   virtual void OnRootWindowResized(const aura::RootWindow* root,
                                    const gfx::Size& new_size) OVERRIDE;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, ConvertPoint);
   FRIEND_TEST_ALL_PREFIXES(MultiDisplayManagerTest, TestNativeDisplaysChanged);
   typedef std::vector<gfx::Display> Displays;
 
   void Init();
-  void AddRemoveDisplayImpl();
   void CycleDisplayImpl();
   void ScaleDisplayImpl();
   gfx::Display& FindDisplayForRootWindow(const aura::RootWindow* root);
 
   // Refer to |aura::DisplayManager::CreateDisplayFromSpec| API for
   // the format of |spec|.
   void AddDisplayFromSpec(const std::string& spec);
 
   void SetInternalDisplayIdForTest(int64 id);
 
   Displays displays_;
 
   int64 internal_display_id_;
 
   // An internal display cache used when the internal display is disconnectd.
   scoped_ptr<gfx::Display> internal_display_;
 
   DISALLOW_COPY_AND_ASSIGN(MultiDisplayManager);
 };
 
 extern const aura::WindowProperty<int64>* const kDisplayIdKey;
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_MULTI_DISPLAY_MANAGER_H_