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

Side by Side Diff: chrome/browser/ui/apps/chrome_app_delegate.h

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
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 #ifndef CHROME_BROWSER_UI_APPS_CHROME_APP_DELEGATE_H_ 5 #ifndef CHROME_BROWSER_UI_APPS_CHROME_APP_DELEGATE_H_
6 #define CHROME_BROWSER_UI_APPS_CHROME_APP_DELEGATE_H_ 6 #define CHROME_BROWSER_UI_APPS_CHROME_APP_DELEGATE_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 void RequestMediaAccessPermission( 56 void RequestMediaAccessPermission(
57 content::WebContents* web_contents, 57 content::WebContents* web_contents,
58 const content::MediaStreamRequest& request, 58 const content::MediaStreamRequest& request,
59 const content::MediaResponseCallback& callback, 59 const content::MediaResponseCallback& callback,
60 const extensions::Extension* extension) override; 60 const extensions::Extension* extension) override;
61 bool CheckMediaAccessPermission( 61 bool CheckMediaAccessPermission(
62 content::WebContents* web_contents, 62 content::WebContents* web_contents,
63 const GURL& security_origin, 63 const GURL& security_origin,
64 content::MediaStreamType type, 64 content::MediaStreamType type,
65 const extensions::Extension* extension) override; 65 const extensions::Extension* extension) override;
66 int PreferredIconSize() override; 66 int PreferredIconSize() const override;
67 void SetWebContentsBlocked(content::WebContents* web_contents, 67 void SetWebContentsBlocked(content::WebContents* web_contents,
68 bool blocked) override; 68 bool blocked) override;
69 bool IsWebContentsVisible(content::WebContents* web_contents) override; 69 bool IsWebContentsVisible(content::WebContents* web_contents) override;
70 void SetTerminatingCallback(const base::Closure& callback) override; 70 void SetTerminatingCallback(const base::Closure& callback) override;
71 void OnHide() override; 71 void OnHide() override;
72 void OnShow() override; 72 void OnShow() override;
73 73
74 // content::NotificationObserver: 74 // content::NotificationObserver:
75 void Observe(int type, 75 void Observe(int type,
76 const content::NotificationSource& source, 76 const content::NotificationSource& source,
77 const content::NotificationDetails& details) override; 77 const content::NotificationDetails& details) override;
78 78
79 bool has_been_shown_; 79 bool has_been_shown_;
80 bool is_hidden_; 80 bool is_hidden_;
81 std::unique_ptr<ScopedKeepAlive> keep_alive_; 81 std::unique_ptr<ScopedKeepAlive> keep_alive_;
82 std::unique_ptr<NewWindowContentsDelegate> new_window_contents_delegate_; 82 std::unique_ptr<NewWindowContentsDelegate> new_window_contents_delegate_;
83 base::Closure terminating_callback_; 83 base::Closure terminating_callback_;
84 content::NotificationRegistrar registrar_; 84 content::NotificationRegistrar registrar_;
85 base::WeakPtrFactory<ChromeAppDelegate> weak_factory_; 85 base::WeakPtrFactory<ChromeAppDelegate> weak_factory_;
86 86
87 DISALLOW_COPY_AND_ASSIGN(ChromeAppDelegate); 87 DISALLOW_COPY_AND_ASSIGN(ChromeAppDelegate);
88 }; 88 };
89 89
90 #endif // CHROME_BROWSER_UI_APPS_CHROME_APP_DELEGATE_H_ 90 #endif // CHROME_BROWSER_UI_APPS_CHROME_APP_DELEGATE_H_
OLDNEW
« no previous file with comments | « chrome/browser/extensions/chrome_app_icon.cc ('k') | chrome/browser/ui/apps/chrome_app_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698