athena/main/athena_views_delegate.cc - Issue 653563004: NULL -> nullptr under athena/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: athena/main/athena_views_delegate.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:

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "athena/main/athena_views_delegate.h"	5 #include "athena/main/athena_views_delegate.h"

6	6

7 #include "athena/main/athena_frame_view.h"	7 #include "athena/main/athena_frame_view.h"

8 #include "athena/screen/public/screen_manager.h"	8 #include "athena/screen/public/screen_manager.h"

9 #include "ui/views/views_delegate.h"	9 #include "ui/views/views_delegate.h"

10	10

(...skipping 26 matching lines...) Expand all Loading...
37	37

38 } // namespace	38 } // namespace

39	39

40 void CreateAthenaViewsDelegate() {	40 void CreateAthenaViewsDelegate() {

41 views::ViewsDelegate::views_delegate = new AthenaViewsDelegate;	41 views::ViewsDelegate::views_delegate = new AthenaViewsDelegate;

42 }	42 }

43	43

44 void ShutdownAthenaViewsDelegate() {	44 void ShutdownAthenaViewsDelegate() {

45 CHECK(views::ViewsDelegate::views_delegate);	45 CHECK(views::ViewsDelegate::views_delegate);

46 delete views::ViewsDelegate::views_delegate;	46 delete views::ViewsDelegate::views_delegate;

47 views::ViewsDelegate::views_delegate = NULL;	47 views::ViewsDelegate::views_delegate = nullptr;

48 }	48 }

49	49

50 } // namespace athena	50 } // namespace athena

OLD	NEW