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

Side by Side Diff: extensions/shell/browser/shell_app_delegate.cc

Issue 2900783003: Handle app custom icon via aura::Window property. (Closed)
Patch Set: fix mac compile Created 3 years, 6 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
« no previous file with comments | « extensions/shell/browser/shell_app_delegate.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "extensions/shell/browser/shell_app_delegate.h" 5 #include "extensions/shell/browser/shell_app_delegate.h"
6 6
7 #include "content/public/browser/web_contents.h" 7 #include "content/public/browser/web_contents.h"
8 #include "extensions/common/constants.h" 8 #include "extensions/common/constants.h"
9 #include "extensions/shell/browser/media_capture_util.h" 9 #include "extensions/shell/browser/media_capture_util.h"
10 #include "extensions/shell/browser/shell_extension_web_contents_observer.h" 10 #include "extensions/shell/browser/shell_extension_web_contents_observer.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 74
75 bool ShellAppDelegate::CheckMediaAccessPermission( 75 bool ShellAppDelegate::CheckMediaAccessPermission(
76 content::WebContents* web_contents, 76 content::WebContents* web_contents,
77 const GURL& security_origin, 77 const GURL& security_origin,
78 content::MediaStreamType type, 78 content::MediaStreamType type,
79 const Extension* extension) { 79 const Extension* extension) {
80 media_capture_util::VerifyMediaAccessPermission(type, extension); 80 media_capture_util::VerifyMediaAccessPermission(type, extension);
81 return true; 81 return true;
82 } 82 }
83 83
84 int ShellAppDelegate::PreferredIconSize() { 84 int ShellAppDelegate::PreferredIconSize() const {
85 return extension_misc::EXTENSION_ICON_SMALL; 85 return extension_misc::EXTENSION_ICON_SMALL;
86 } 86 }
87 87
88 void ShellAppDelegate::SetWebContentsBlocked( 88 void ShellAppDelegate::SetWebContentsBlocked(
89 content::WebContents* web_contents, 89 content::WebContents* web_contents,
90 bool blocked) { 90 bool blocked) {
91 NOTIMPLEMENTED(); 91 NOTIMPLEMENTED();
92 } 92 }
93 93
94 bool ShellAppDelegate::IsWebContentsVisible( 94 bool ShellAppDelegate::IsWebContentsVisible(
95 content::WebContents* web_contents) { 95 content::WebContents* web_contents) {
96 return true; 96 return true;
97 } 97 }
98 98
99 void ShellAppDelegate::SetTerminatingCallback(const base::Closure& callback) { 99 void ShellAppDelegate::SetTerminatingCallback(const base::Closure& callback) {
100 // TODO(jamescook): Should app_shell continue to close the app window 100 // TODO(jamescook): Should app_shell continue to close the app window
101 // manually or should it use a browser termination callback like Chrome? 101 // manually or should it use a browser termination callback like Chrome?
102 } 102 }
103 103
104 } // namespace extensions 104 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/shell/browser/shell_app_delegate.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698