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

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

Issue 18290002: [SystemInfo API] Finish TODOs in SystemInfoProvider (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dev_rewrite_storage_info_api
Patch Set: Pass chromeos unit_tests Created 7 years, 5 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/display_info_provider_chromeos.cc
diff --git a/chrome/browser/extensions/api/system_info_display/display_info_provider_chromeos.cc b/chrome/browser/extensions/api/system_info_display/display_info_provider_chromeos.cc
index 7ce7621ec7a6a09b968ac9336a32bee44f12f3db..e680bc26bef047fc441761264f819682259f1aa2 100644
--- a/chrome/browser/extensions/api/system_info_display/display_info_provider_chromeos.cc
+++ b/chrome/browser/extensions/api/system_info_display/display_info_provider_chromeos.cc
@@ -411,12 +411,11 @@ bool SetInfoImpl(const std::string& display_id_str,
} // namespace
void DisplayInfoProvider::RequestInfo(const RequestInfoCallback& callback) {
- DisplayInfo requested_info;
- bool success = QueryInfo(&requested_info);
+ bool success = QueryInfo();
base::MessageLoopProxy::current()->PostTask(
FROM_HERE,
- base::Bind(callback, requested_info, success));
+ base::Bind(callback, success));
}
void DisplayInfoProvider::SetInfo(const std::string& display_id,
@@ -429,9 +428,8 @@ void DisplayInfoProvider::SetInfo(const std::string& display_id,
base::Bind(callback, success, error));
}
-bool DisplayInfoProvider::QueryInfo(DisplayInfo* info) {
- DCHECK(info);
- info->clear();
+bool DisplayInfoProvider::QueryInfo() {
+ info_.clear();
DisplayManager* display_manager =
ash::Shell::GetInstance()->display_manager();
@@ -440,7 +438,7 @@ bool DisplayInfoProvider::QueryInfo(DisplayInfo* info) {
int64 primary_id = ash::Shell::GetScreen()->GetPrimaryDisplay().id();
for (size_t i = 0; i < display_manager->GetNumDisplays(); ++i) {
AddInfoForDisplay(*display_manager->GetDisplayAt(i), display_manager,
- primary_id, info);
+ primary_id, &info_);
}
return true;

Powered by Google App Engine
This is Rietveld 408576698