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

Side by Side Diff: chrome/browser/extensions/api/notifications/notifications_api.cc

Issue 1188213002: Making icon url for buttons in notification optional. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added Test case. Created 5 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 | « no previous file | chrome/browser/extensions/api/notifications/notifications_apitest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/extensions/api/notifications/notifications_api.h" 5 #include "chrome/browser/extensions/api/notifications/notifications_api.h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/guid.h" 8 #include "base/guid.h"
9 #include "base/rand_util.h" 9 #include "base/rand_util.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 291
292 for (size_t i = 0; i < number_of_buttons; i++) { 292 for (size_t i = 0; i < number_of_buttons; i++) {
293 message_center::ButtonInfo info( 293 message_center::ButtonInfo info(
294 base::UTF8ToUTF16((*options->buttons)[i]->title)); 294 base::UTF8ToUTF16((*options->buttons)[i]->title));
295 extensions::api::notifications::NotificationBitmap* icon_bitmap_ptr = 295 extensions::api::notifications::NotificationBitmap* icon_bitmap_ptr =
296 (*options->buttons)[i]->icon_bitmap.get(); 296 (*options->buttons)[i]->icon_bitmap.get();
297 if (icon_bitmap_ptr) { 297 if (icon_bitmap_ptr) {
298 NotificationConversionHelper::NotificationBitmapToGfxImage( 298 NotificationConversionHelper::NotificationBitmapToGfxImage(
299 image_scale, bitmap_sizes.button_icon_size, *icon_bitmap_ptr, 299 image_scale, bitmap_sizes.button_icon_size, *icon_bitmap_ptr,
300 &info.icon); 300 &info.icon);
301 optional_fields.buttons.push_back(info);
302 } 301 }
302 optional_fields.buttons.push_back(info);
303 } 303 }
304 } 304 }
305 305
306 if (options->context_message) { 306 if (options->context_message) {
307 optional_fields.context_message = 307 optional_fields.context_message =
308 base::UTF8ToUTF16(*options->context_message); 308 base::UTF8ToUTF16(*options->context_message);
309 } 309 }
310 310
311 bool has_image = options->image_bitmap.get() && 311 bool has_image = options->image_bitmap.get() &&
312 NotificationConversionHelper::NotificationBitmapToGfxImage( 312 NotificationConversionHelper::NotificationBitmapToGfxImage(
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
427 std::vector<message_center::ButtonInfo> buttons; 427 std::vector<message_center::ButtonInfo> buttons;
428 for (size_t i = 0; i < number_of_buttons; i++) { 428 for (size_t i = 0; i < number_of_buttons; i++) {
429 message_center::ButtonInfo button( 429 message_center::ButtonInfo button(
430 base::UTF8ToUTF16((*options->buttons)[i]->title)); 430 base::UTF8ToUTF16((*options->buttons)[i]->title));
431 extensions::api::notifications::NotificationBitmap* icon_bitmap_ptr = 431 extensions::api::notifications::NotificationBitmap* icon_bitmap_ptr =
432 (*options->buttons)[i]->icon_bitmap.get(); 432 (*options->buttons)[i]->icon_bitmap.get();
433 if (icon_bitmap_ptr) { 433 if (icon_bitmap_ptr) {
434 NotificationConversionHelper::NotificationBitmapToGfxImage( 434 NotificationConversionHelper::NotificationBitmapToGfxImage(
435 image_scale, bitmap_sizes.button_icon_size, *icon_bitmap_ptr, 435 image_scale, bitmap_sizes.button_icon_size, *icon_bitmap_ptr,
436 &button.icon); 436 &button.icon);
437 buttons.push_back(button);
438 } 437 }
438 buttons.push_back(button);
439 } 439 }
440 notification->set_buttons(buttons); 440 notification->set_buttons(buttons);
441 } 441 }
442 442
443 if (options->context_message) { 443 if (options->context_message) {
444 notification->set_context_message( 444 notification->set_context_message(
445 base::UTF8ToUTF16(*options->context_message)); 445 base::UTF8ToUTF16(*options->context_message));
446 } 446 }
447 447
448 gfx::Image image; 448 gfx::Image image;
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
683 ? api::notifications::PERMISSION_LEVEL_GRANTED 683 ? api::notifications::PERMISSION_LEVEL_GRANTED
684 : api::notifications::PERMISSION_LEVEL_DENIED; 684 : api::notifications::PERMISSION_LEVEL_DENIED;
685 685
686 SetResult(new base::StringValue(api::notifications::ToString(result))); 686 SetResult(new base::StringValue(api::notifications::ToString(result)));
687 SendResponse(true); 687 SendResponse(true);
688 688
689 return true; 689 return true;
690 } 690 }
691 691
692 } // namespace extensions 692 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/api/notifications/notifications_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698