Chromium Code Reviews| 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..88c63c32e543e52657418503fa10c948837baa9e 100644 |
| --- a/extensions/browser/api/app_window/app_window_api.cc |
| +++ b/extensions/browser/api/app_window/app_window_api.cc |
| @@ -332,6 +332,14 @@ bool AppWindowCreateFunction::RunAsync() { |
| } |
| } |
| + if (options->icon.get()) { |
| + create_params.window_icon_url = GURL(*options->icon.get()); |
| + |
| + if (!create_params.window_icon_url.is_valid()) |
| + create_params.window_icon_url = |
| + extension()->GetResourceURL(*options->icon.get()); |
|
stevenjb
2016/08/04 21:00:47
{}
Andra Paraschiv
2016/08/08 13:34:12
Done.
|
| + } |
| + |
| if (options->type != app_window::WINDOW_TYPE_PANEL) { |
| switch (options->state) { |
| case app_window::STATE_NONE: |