Index: extensions/browser/api/app_window/app_window_api.cc |
diff --git a/extensions/browser/api/app_window/app_window_api.cc b/extensions/browser/api/app_window/app_window_api.cc |
index 4f8be57cf179d468a58eee1427461e77502835b8..e9f30340243b86247d072bda652d12817985357b 100644 |
--- a/extensions/browser/api/app_window/app_window_api.cc |
+++ b/extensions/browser/api/app_window/app_window_api.cc |
@@ -332,6 +332,15 @@ bool AppWindowCreateFunction::RunAsync() { |
} |
} |
+ if (options->icon.get()) { |
+ create_params.window_icon_url = GURL(*options->icon.get()); |
+ |
stevenjb
2016/08/08 22:26:45
If I read this correctly, first we are looking for
Andra Paraschiv
2016/08/09 11:34:47
Done.
|
+ if (!create_params.window_icon_url.is_valid()) { |
+ create_params.window_icon_url = |
+ extension()->GetResourceURL(*options->icon.get()); |
+ } |
+ } |
+ |
if (options->type != app_window::WINDOW_TYPE_PANEL) { |
switch (options->state) { |
case app_window::STATE_NONE: |