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

Side by Side Diff: athena/extensions/chrome/app_list_controller_delegate_athena.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 unified diff | Download patch
OLDNEW
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/extensions/chrome/app_list_controller_delegate_athena.h" 5 #include "athena/extensions/chrome/app_list_controller_delegate_athena.h"
6 6
7 #include "athena/activity/public/activity_factory.h" 7 #include "athena/activity/public/activity_factory.h"
8 #include "athena/extensions/public/extensions_delegate.h" 8 #include "athena/extensions/public/extensions_delegate.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "extensions/common/extension.h" 10 #include "extensions/common/extension.h"
11 #include "ui/app_list/views/app_list_view.h" 11 #include "ui/app_list/views/app_list_view.h"
12 12
13 namespace athena { 13 namespace athena {
14 14
15 AppListControllerDelegateAthena::AppListControllerDelegateAthena() { 15 AppListControllerDelegateAthena::AppListControllerDelegateAthena() {
16 } 16 }
17 17
18 AppListControllerDelegateAthena::~AppListControllerDelegateAthena() { 18 AppListControllerDelegateAthena::~AppListControllerDelegateAthena() {
19 } 19 }
20 20
21 void AppListControllerDelegateAthena::DismissView() { 21 void AppListControllerDelegateAthena::DismissView() {
22 } 22 }
23 23
24 gfx::NativeWindow AppListControllerDelegateAthena::GetAppListWindow() { 24 gfx::NativeWindow AppListControllerDelegateAthena::GetAppListWindow() {
25 NOTIMPLEMENTED(); 25 NOTIMPLEMENTED();
26 return NULL; 26 return nullptr;
27 } 27 }
28 28
29 gfx::Rect AppListControllerDelegateAthena::GetAppListBounds() { 29 gfx::Rect AppListControllerDelegateAthena::GetAppListBounds() {
30 NOTIMPLEMENTED(); 30 NOTIMPLEMENTED();
31 return gfx::Rect(); 31 return gfx::Rect();
32 } 32 }
33 33
34 gfx::ImageSkia AppListControllerDelegateAthena::GetWindowIcon() { 34 gfx::ImageSkia AppListControllerDelegateAthena::GetWindowIcon() {
35 return gfx::ImageSkia(); 35 return gfx::ImageSkia();
36 } 36 }
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 const base::FilePath& profile_path) { 105 const base::FilePath& profile_path) {
106 // Ash doesn't have profile switching. 106 // Ash doesn't have profile switching.
107 NOTREACHED(); 107 NOTREACHED();
108 } 108 }
109 109
110 bool AppListControllerDelegateAthena::ShouldShowUserIcon() { 110 bool AppListControllerDelegateAthena::ShouldShowUserIcon() {
111 return false; 111 return false;
112 } 112 }
113 113
114 } // namespace athena 114 } // namespace athena
OLDNEW
« no previous file with comments | « athena/extensions/athena_app_delegate_base.cc ('k') | athena/extensions/chrome/athena_chrome_app_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698