summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/views/extensions
diff options
context:
space:
mode:
authormihaip@chromium.org <mihaip@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-06 04:33:13 +0000
committermihaip@chromium.org <mihaip@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-06 04:33:13 +0000
commit0e4ee1bde8c498c0986aacc868396d7d5b2711c8 (patch)
tree0c301fed95b55d5215a410ff99b6ca459e12299c /chrome/browser/ui/views/extensions
parent1eb5a2298dbc3dc3d30272847cdaa3e6b4d2791d (diff)
downloadchromium_src-0e4ee1bde8c498c0986aacc868396d7d5b2711c8.zip
chromium_src-0e4ee1bde8c498c0986aacc868396d7d5b2711c8.tar.gz
chromium_src-0e4ee1bde8c498c0986aacc868396d7d5b2711c8.tar.bz2
Implement the inline extensions/apps install UI for Cocoa.
This required a new .xib (ExtensionInstallPromptInline) that shows store data (star rating, number of reviews, number of users). Current .xibs (ExtensionInstallPrompt and ExtensionInstallPromptNoWarnings) were rearranged slightly to have the icon on the right and use a bulleted list for the list of permissions (instead of a box) per Cole's mock. This is the Cocoa side of r99407 (views) and r99205 (GTK). BUG=93380 TEST=no Review URL: http://codereview.chromium.org/7835039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99695 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views/extensions')
-rw-r--r--chrome/browser/ui/views/extensions/extension_install_dialog_view.cc10
1 files changed, 3 insertions, 7 deletions
diff --git a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
index 9e41a93..bb84b2a 100644
--- a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
+++ b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
@@ -49,9 +49,8 @@ const int kHeadingFontSizeDelta = 1;
const int kRatingFontSizeDelta = -1;
-void AddResourceIcon(int resource_id, views::View* parent) {
- const SkBitmap* skia_image = ResourceBundle::GetSharedInstance().
- GetBitmapNamed(resource_id);
+void AddResourceIcon(const SkBitmap* skia_image, void* data) {
+ views::View* parent = static_cast<views::View*>(data);
views::ImageView* image_view = new views::ImageView();
image_view->SetImage(*skia_image);
parent->AddChildView(image_view);
@@ -195,10 +194,7 @@ ExtensionInstallDialogView::ExtensionInstallDialogView(
rating->SetLayoutManager(new views::BoxLayout(
views::BoxLayout::kHorizontal, 0, 0, 0));
layout->AddView(rating);
- prompt.AppendRatingStars(
- reinterpret_cast<ExtensionInstallUI::Prompt::StarAppender>(
- AddResourceIcon),
- rating);
+ prompt.AppendRatingStars(AddResourceIcon, rating);
views::Label* rating_count = new views::Label(
UTF16ToWide(prompt.GetRatingCount()));