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

Unified Diff: chrome/browser/ui/webui/options/chromeos/display_options_handler.cc

Issue 1129083003: More base::Values-related bare pointer -> scoped_ptr conversions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix bad merge Created 5 years, 7 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/ui/webui/options/chromeos/display_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc
index c451e04b4e50a36242bae58300dea52e4b1527db..c12bcdadfd9156fddb84ee311195befce9fd82b6 100644
--- a/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc
@@ -303,8 +303,8 @@ void DisplayOptionsHandler::SendDisplayInfo(
js_displays.Append(js_display);
}
- scoped_ptr<base::Value> layout_value(base::Value::CreateNullValue());
- scoped_ptr<base::Value> offset_value(base::Value::CreateNullValue());
+ scoped_ptr<base::Value> layout_value = base::Value::CreateNullValue();
+ scoped_ptr<base::Value> offset_value = base::Value::CreateNullValue();
if (display_manager->GetNumDisplays() > 1) {
const ash::DisplayLayout layout =
display_manager->GetCurrentDisplayLayout();

Powered by Google App Engine
This is Rietveld 408576698