Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2330)

Unified Diff: ash/display/multi_display_manager.h

Issue 10905242: add ash_resources.grd and necessary changes to use images in ash/resources (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: presubmit.py Created 8 years, 3 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
Index: ash/display/multi_display_manager.h
diff --git a/ash/display/multi_display_manager.h b/ash/display/multi_display_manager.h
index 248885db4d785427090517b6197a124cf842c5f5..e2c21b8db7641ced8fb9469ae205897e807597f4 100644
--- a/ash/display/multi_display_manager.h
+++ b/ash/display/multi_display_manager.h
@@ -49,6 +49,8 @@ class ASH_EXPORT MultiDisplayManager : public aura::DisplayManager,
// in the cache, if any.
void InitInternalDisplayInfo();
+ void SetOutputNameForPrimaryDisplay(const std::sdtring& name);
+
// True if there is an internal display.
bool HasInternalDisplay() const;
@@ -102,6 +104,8 @@ class ASH_EXPORT MultiDisplayManager : public aura::DisplayManager,
// display.
int64 EnableInternalDisplayForTest();
+ void MovePrimaryToTop();
+
Displays displays_;
int64 internal_display_id_;
@@ -109,6 +113,10 @@ class ASH_EXPORT MultiDisplayManager : public aura::DisplayManager,
// An internal display cache used when the internal display is disconnectd.
scoped_ptr<gfx::Display> internal_display_;
+ std::vector<std::string> output_names_;
+
+ std::string primary_output_name_;
+
DISALLOW_COPY_AND_ASSIGN(MultiDisplayManager);
};

Powered by Google App Engine
This is Rietveld 408576698