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

Unified Diff: athena/virtual_keyboard/virtual_keyboard_manager_impl.cc

Issue 653563004: NULL -> nullptr under athena/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Created 6 years, 2 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 | « athena/util/fill_layout_manager_unittest.cc ('k') | athena/wm/bezel_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/virtual_keyboard/virtual_keyboard_manager_impl.cc
diff --git a/athena/virtual_keyboard/virtual_keyboard_manager_impl.cc b/athena/virtual_keyboard/virtual_keyboard_manager_impl.cc
index 70b0630fb477b33ebfe4594e58db887c40ad69b9..4c19e2ace7f00b56ddaebb504d38e3b9d1648bbd 100644
--- a/athena/virtual_keyboard/virtual_keyboard_manager_impl.cc
+++ b/athena/virtual_keyboard/virtual_keyboard_manager_impl.cc
@@ -62,8 +62,7 @@ class BasicKeyboardControllerProxy : public keyboard::KeyboardControllerProxy {
class VirtualKeyboardManagerImpl : public VirtualKeyboardManager {
public:
explicit VirtualKeyboardManagerImpl(content::BrowserContext* browser_context)
- : browser_context_(browser_context),
- container_(NULL) {
+ : browser_context_(browser_context), container_(nullptr) {
CHECK(!instance);
instance = this;
Init();
@@ -71,9 +70,9 @@ class VirtualKeyboardManagerImpl : public VirtualKeyboardManager {
virtual ~VirtualKeyboardManagerImpl() {
CHECK_EQ(this, instance);
- instance = NULL;
+ instance = nullptr;
- keyboard::KeyboardController::ResetInstance(NULL);
+ keyboard::KeyboardController::ResetInstance(nullptr);
}
private:
« no previous file with comments | « athena/util/fill_layout_manager_unittest.cc ('k') | athena/wm/bezel_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698