Add IsInternal property to gfx::Display

ash/display/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_DISPLAY_MANAGER_H_
 #define ASH_DISPLAY_DISPLAY_MANAGER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 41 matching lines @@
   }
 
   // True if the given |display| is currently connected.
   bool IsActiveDisplay(const gfx::Display& display) const;
 
   // True if there is an internal display.
   bool HasInternalDisplay() const;
 
   bool IsInternalDisplayId(int64 id) const;
 
-  uint64 internal_display_id() const { return internal_display_id_; }
-
   bool UpdateWorkAreaOfDisplayNearestWindow(const aura::Window* window,
                                             const gfx::Insets& insets);
 
   // Returns display for given |id|;
   const gfx::Display& GetDisplayForId(int64 id) const;
 
   // Finds the display that contains |point| in screeen coordinates.
   // Returns invalid display if there is no display that can satisfy
   // the condition.
   const gfx::Display& FindDisplayContainingPoint(
@@ skipping 90 matching lines @@
   gfx::Display& FindDisplayForId(int64 id);
 
   // Refer to |aura::DisplayManager::CreateDisplayFromSpec| API for
   // the format of |spec|.
   void AddDisplayFromSpec(const std::string& spec);
 
   // Set the 1st display as an internal display and returns the display Id for
   // the internal display.
   int64 SetFirstDisplayAsInternalDisplayForTest();
 
+  // Reset the internal display id after test finishes.
+  void ResetInternalDisplayForTest();

[oshima, 2013/02/12 17:38:51]

If you want to keep this, then please move this to test::DisplayManagerTestApi.

(I'm moving other tests method to there)

[ynovikov, 2013/02/12 21:17:47]

Done.

+
   // Checks if the mouse pointer is on one of displays, and moves to
   // the center of the nearest display if it's outside of all displays.
   void EnsurePointerInDisplays();
 
   // Updates |display_info_| by calling platform-dependent functions.
   void RefreshDisplayInfo();
 
   // Update the display's id in the |display_list| to match the ones
   // stored in this display manager's |displays_|. This is used to
   // emulate display change behavior during the test byn creating the
   // display list with the same display ids but with different bounds
   void SetDisplayIdsForTest(DisplayList* display_list) const;
 
   // Forcibly specify 'has_overscan' flag of the DisplayInfo for specified |id|.
   void SetHasOverscanFlagForTest(int64 id, bool has_overscan);
 
   DisplayList displays_;
 
-  int64 internal_display_id_;
-
   // An internal display cache used when the internal display is disconnectd.
   scoped_ptr<gfx::Display> internal_display_;
 
   bool force_bounds_changed_;
 
   // The mapping from the display ID to its internal data.
   std::map<int64, DisplayInfo> display_info_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayManager);
 };
 
 extern const aura::WindowProperty<int64>* const kDisplayIdKey;
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_DISPLAY_MANAGER_H_