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

Unified Diff: chrome/browser/extensions/api/system_info_display/system_info_display_apitest.cc

Issue 16687002: Add additional properties to display system info on ChromeOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review feedback; win compile fix Created 7 years, 6 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: chrome/browser/extensions/api/system_info_display/system_info_display_apitest.cc
diff --git a/chrome/browser/extensions/api/system_info_display/system_info_display_apitest.cc b/chrome/browser/extensions/api/system_info_display/system_info_display_apitest.cc
index 35107f79bf31d7cd9b9ded7cae098ce650ec9e9e..fb54793f1b08c67f74a631813116563bda659ac4 100644
--- a/chrome/browser/extensions/api/system_info_display/system_info_display_apitest.cc
+++ b/chrome/browser/extensions/api/system_info_display/system_info_display_apitest.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "base/command_line.h"
#include "base/message_loop.h"
+#include "base/strings/string_number_conversions.h"
#include "chrome/browser/extensions/api/system_info_display/display_info_provider.h"
#include "chrome/browser/extensions/extension_apitest.h"
#include "chrome/browser/extensions/extension_test_message_listener.h"
@@ -17,19 +18,28 @@ class MockDisplayInfoProvider : public DisplayInfoProvider {
public:
virtual bool QueryInfo(DisplayInfo* info) OVERRIDE {
info->clear();
- for (int i = 0; i < 2; i++) {
+ for (int i = 0; i < 4; i++) {
linked_ptr<DisplayUnitInfo> unit(new DisplayUnitInfo());
- unit->id = "DISPLAY";
- unit->name = "DISPLAY NAME";
+ unit->id = base::IntToString(i);
+ unit->name = "DISPLAY NAME FOR " + unit->id;
+ if (i == 1)
+ unit->mirroring_source_id = "0";
unit->is_primary = i == 0 ? true : false;
unit->is_internal = i == 0 ? true : false;
unit->is_enabled = true;
+ unit->rotation = (90 * i) % 360;
unit->dpi_x = 96.0;
unit->dpi_y = 96.0;
unit->bounds.left = 0;
unit->bounds.top = 0;
unit->bounds.width = 1280;
unit->bounds.height = 720;
+ if (i == 0) {
+ unit->visible_area.left = 20;
+ unit->visible_area.top = 40;
+ unit->visible_area.width = 1280;
+ unit->visible_area.height = 720;
+ }
unit->work_area.left = 0;
unit->work_area.top = 0;
unit->work_area.width = 960;

Powered by Google App Engine
This is Rietveld 408576698