| OLD | NEW |
| 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/ui/views/extensions/extension_install_dialog_view.h" | 5 #include "chrome/browser/ui/views/extensions/extension_install_dialog_view.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <algorithm> | 8 #include <algorithm> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 242 views::Label* user_count = | 242 views::Label* user_count = |
| 243 new views::Label(prompt_->GetUserCount(), small_font_list); | 243 new views::Label(prompt_->GetUserCount(), small_font_list); |
| 244 user_count->SetAutoColorReadabilityEnabled(false); | 244 user_count->SetAutoColorReadabilityEnabled(false); |
| 245 user_count->SetEnabledColor(SK_ColorGRAY); | 245 user_count->SetEnabledColor(SK_ColorGRAY); |
| 246 layout->AddView(user_count); | 246 layout->AddView(user_count); |
| 247 } | 247 } |
| 248 | 248 |
| 249 if (prompt_->ShouldShowPermissions()) { | 249 if (prompt_->ShouldShowPermissions()) { |
| 250 layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing); | 250 layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing); |
| 251 layout->StartRow(0, column_set_id); | 251 layout->StartRow(0, column_set_id); |
| 252 layout->AddView(new views::Separator(views::Separator::HORIZONTAL), 3, 1, | 252 layout->AddView(new views::Separator(), 3, 1, views::GridLayout::FILL, |
| 253 views::GridLayout::FILL, views::GridLayout::FILL); | 253 views::GridLayout::FILL); |
| 254 } | 254 } |
| 255 | 255 |
| 256 const int content_width = | 256 const int content_width = |
| 257 left_column_width + views::kPanelHorizMargin + kIconSize; | 257 left_column_width + views::kPanelHorizMargin + kIconSize; |
| 258 | 258 |
| 259 // Create the scrollable view which will contain the permissions and retained | 259 // Create the scrollable view which will contain the permissions and retained |
| 260 // files/devices. It will span the full content width. | 260 // files/devices. It will span the full content width. |
| 261 CustomScrollableView* scrollable = new CustomScrollableView(); | 261 CustomScrollableView* scrollable = new CustomScrollableView(); |
| 262 views::GridLayout* scroll_layout = new views::GridLayout(scrollable); | 262 views::GridLayout* scroll_layout = new views::GridLayout(scrollable); |
| 263 scrollable->SetLayoutManager(scroll_layout); | 263 scrollable->SetLayoutManager(scroll_layout); |
| (...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 733 gfx::ImageSkia icon = gfx::CreateVectorIcon( | 733 gfx::ImageSkia icon = gfx::CreateVectorIcon( |
| 734 expanded ? kCaretUpIcon : kCaretDownIcon, gfx::kChromeIconGrey); | 734 expanded ? kCaretUpIcon : kCaretDownIcon, gfx::kChromeIconGrey); |
| 735 arrow_toggle_->SetImage(views::Button::STATE_NORMAL, &icon); | 735 arrow_toggle_->SetImage(views::Button::STATE_NORMAL, &icon); |
| 736 } | 736 } |
| 737 | 737 |
| 738 // static | 738 // static |
| 739 ExtensionInstallPrompt::ShowDialogCallback | 739 ExtensionInstallPrompt::ShowDialogCallback |
| 740 ExtensionInstallPrompt::GetViewsShowDialogCallback() { | 740 ExtensionInstallPrompt::GetViewsShowDialogCallback() { |
| 741 return base::Bind(&ShowExtensionInstallDialogImpl); | 741 return base::Bind(&ShowExtensionInstallDialogImpl); |
| 742 } | 742 } |
| OLD | NEW |