chrome/renderer/extensions/notifications_native_handler.cc - Issue 308053004: Add appIconMask to notification API

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/renderer/extensions/notifications_native_handler.cc

Issue 308053004: Add appIconMask to notification API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: addressed comments Created 6 years, 5 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 | Annotate | Revision Log

« no previous file with comments | « chrome/common/extensions/api/notifications/notification_style.cc ('k') | chrome/renderer/resources/extensions/notifications_custom_bindings.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 "chrome/renderer/extensions/notifications_native_handler.h"	5 #include "chrome/renderer/extensions/notifications_native_handler.h"

6	6

7 #include <string>	7 #include <string>

8	8

9 #include "base/logging.h"	9 #include "base/logging.h"

10 #include "base/values.h"	10 #include "base/values.h"

(...skipping 20 matching lines...) Expand all Loading...
31 ui::GetScaleForScaleFactor(ui::GetSupportedScaleFactors().back());	31 ui::GetScaleForScaleFactor(ui::GetSupportedScaleFactors().back());

32	32

33 scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue);	33 scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue);

34 dict->SetDouble("scaleFactor", scale_factor);	34 dict->SetDouble("scaleFactor", scale_factor);

35 dict->SetInteger("icon.width", bitmap_sizes.icon_size.width());	35 dict->SetInteger("icon.width", bitmap_sizes.icon_size.width());

36 dict->SetInteger("icon.height", bitmap_sizes.icon_size.height());	36 dict->SetInteger("icon.height", bitmap_sizes.icon_size.height());

37 dict->SetInteger("image.width", bitmap_sizes.image_size.width());	37 dict->SetInteger("image.width", bitmap_sizes.image_size.width());

38 dict->SetInteger("image.height", bitmap_sizes.image_size.height());	38 dict->SetInteger("image.height", bitmap_sizes.image_size.height());

39 dict->SetInteger("buttonIcon.width", bitmap_sizes.button_icon_size.width());	39 dict->SetInteger("buttonIcon.width", bitmap_sizes.button_icon_size.width());

40 dict->SetInteger("buttonIcon.height", bitmap_sizes.button_icon_size.height());	40 dict->SetInteger("buttonIcon.height", bitmap_sizes.button_icon_size.height());

	41 dict->SetInteger("appIconMask.width",

	42 bitmap_sizes.app_icon_mask_size.width());

	43 dict->SetInteger("appIconMask.height",

	44 bitmap_sizes.app_icon_mask_size.height());

41	45

42 scoped_ptr<content::V8ValueConverter> converter(	46 scoped_ptr<content::V8ValueConverter> converter(

43 content::V8ValueConverter::create());	47 content::V8ValueConverter::create());

44 args.GetReturnValue().Set(	48 args.GetReturnValue().Set(

45 converter->ToV8Value(dict.get(), context()->v8_context()));	49 converter->ToV8Value(dict.get(), context()->v8_context()));

46 }	50 }

47	51

48 } // namespace extensions	52 } // namespace extensions

OLD	NEW