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

Side by Side Diff: athena/extensions/chrome/athena_chrome_app_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:
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/athena_chrome_app_delegate.h" 5 #include "athena/extensions/chrome/athena_chrome_app_delegate.h"
6 6
7 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" 7 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
8 #include "chrome/browser/favicon/favicon_tab_helper.h" 8 #include "chrome/browser/favicon/favicon_tab_helper.h"
9 #include "chrome/browser/file_select_helper.h" 9 #include "chrome/browser/file_select_helper.h"
10 #include "chrome/browser/media/media_capture_devices_dispatcher.h" 10 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 content::MediaStreamType type, 74 content::MediaStreamType type,
75 const extensions::Extension* extension) { 75 const extensions::Extension* extension) {
76 return MediaCaptureDevicesDispatcher::GetInstance() 76 return MediaCaptureDevicesDispatcher::GetInstance()
77 ->CheckMediaAccessPermission( 77 ->CheckMediaAccessPermission(
78 web_contents, security_origin, type, extension); 78 web_contents, security_origin, type, extension);
79 } 79 }
80 80
81 void AthenaChromeAppDelegate::SetWebContentsBlocked( 81 void AthenaChromeAppDelegate::SetWebContentsBlocked(
82 content::WebContents* web_contents, 82 content::WebContents* web_contents,
83 bool blocked) { 83 bool blocked) {
84 // RenderViewHost may be NULL during shutdown. 84 // RenderViewHost may be nullptr during shutdown.
85 content::RenderViewHost* host = web_contents->GetRenderViewHost(); 85 content::RenderViewHost* host = web_contents->GetRenderViewHost();
86 if (host) { 86 if (host) {
87 host->Send(new ChromeViewMsg_SetVisuallyDeemphasized(host->GetRoutingID(), 87 host->Send(new ChromeViewMsg_SetVisuallyDeemphasized(host->GetRoutingID(),
88 blocked)); 88 blocked));
89 } 89 }
90 } 90 }
91 91
92 } // namespace athena 92 } // namespace athena
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698