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

Unified Diff: chrome/browser/ui/ash/chrome_keyboard_ui.cc

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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
« no previous file with comments | « chrome/browser/ui/ash/chrome_keyboard_ui.h ('k') | chrome/browser/ui/ash/chrome_launcher_prefs.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/chrome_keyboard_ui.cc
diff --git a/chrome/browser/ui/ash/chrome_keyboard_ui.cc b/chrome/browser/ui/ash/chrome_keyboard_ui.cc
index 71408e68f8cacf876dc124e0b36f81c404faf789..b48298207a09325ac4fb6f03bc34e3698cb0fa2a 100644
--- a/chrome/browser/ui/ash/chrome_keyboard_ui.cc
+++ b/chrome/browser/ui/ash/chrome_keyboard_ui.cc
@@ -88,15 +88,16 @@ class AshKeyboardControllerObserver
return;
}
- scoped_ptr<base::ListValue> event_args(new base::ListValue());
- scoped_ptr<base::DictionaryValue> new_bounds(new base::DictionaryValue());
+ std::unique_ptr<base::ListValue> event_args(new base::ListValue());
+ std::unique_ptr<base::DictionaryValue> new_bounds(
+ new base::DictionaryValue());
new_bounds->SetInteger("left", bounds.x());
new_bounds->SetInteger("top", bounds.y());
new_bounds->SetInteger("width", bounds.width());
new_bounds->SetInteger("height", bounds.height());
event_args->Append(new_bounds.release());
- scoped_ptr<extensions::Event> event(new extensions::Event(
+ std::unique_ptr<extensions::Event> event(new extensions::Event(
extensions::events::VIRTUAL_KEYBOARD_PRIVATE_ON_BOUNDS_CHANGED,
virtual_keyboard_private::OnBoundsChanged::kEventName,
std::move(event_args)));
@@ -210,14 +211,15 @@ void ChromeKeyboardUI::SetUpdateInputType(ui::TextInputType type) {
return;
}
- scoped_ptr<base::ListValue> event_args(new base::ListValue());
- scoped_ptr<base::DictionaryValue> input_context(new base::DictionaryValue());
+ std::unique_ptr<base::ListValue> event_args(new base::ListValue());
+ std::unique_ptr<base::DictionaryValue> input_context(
+ new base::DictionaryValue());
input_context->SetString("type",
virtual_keyboard_private::ToString(
TextInputTypeToGeneratedInputTypeEnum(type)));
event_args->Append(input_context.release());
- scoped_ptr<extensions::Event> event(new extensions::Event(
+ std::unique_ptr<extensions::Event> event(new extensions::Event(
extensions::events::VIRTUAL_KEYBOARD_PRIVATE_ON_TEXT_INPUT_BOX_FOCUSED,
virtual_keyboard_private::OnTextInputBoxFocused::kEventName,
std::move(event_args)));
« no previous file with comments | « chrome/browser/ui/ash/chrome_keyboard_ui.h ('k') | chrome/browser/ui/ash/chrome_launcher_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698