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/browser/ui/views/website_settings/permissions_bubble_view.h" | 5 #include "chrome/browser/ui/views/website_settings/permissions_bubble_view.h" |
6 | 6 |
7 #include "base/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.h" |
8 #include "base/strings/string16.h" | 8 #include "base/strings/string16.h" |
9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
11 #include "chrome/browser/ui/views/exclusive_access_bubble_views.h" | 11 #include "chrome/browser/ui/views/exclusive_access_bubble_views.h" |
12 #include "chrome/browser/ui/views/frame/browser_view.h" | 12 #include "chrome/browser/ui/views/frame/browser_view.h" |
13 #include "chrome/browser/ui/views/frame/top_container_view.h" | 13 #include "chrome/browser/ui/views/frame/top_container_view.h" |
14 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" | 14 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
15 #include "chrome/browser/ui/views/location_bar/location_icon_view.h" | 15 #include "chrome/browser/ui/views/location_bar/location_icon_view.h" |
16 #include "chrome/browser/ui/views/website_settings/permission_selector_view.h" | 16 #include "chrome/browser/ui/views/website_settings/permission_selector_view.h" |
17 #include "chrome/browser/ui/views/website_settings/permission_selector_view_obse
rver.h" | 17 #include "chrome/browser/ui/views/website_settings/permission_selector_view_obse
rver.h" |
18 #include "chrome/browser/ui/website_settings/permission_bubble_request.h" | 18 #include "chrome/browser/ui/website_settings/permission_bubble_request.h" |
19 #include "chrome/common/pref_names.h" | 19 #include "chrome/common/pref_names.h" |
20 #include "chrome/grit/generated_resources.h" | 20 #include "chrome/grit/generated_resources.h" |
21 #include "net/base/net_util.h" | 21 #include "components/url_formatter/url_formatter.h" |
22 #include "ui/accessibility/ax_view_state.h" | 22 #include "ui/accessibility/ax_view_state.h" |
23 #include "ui/base/l10n/l10n_util.h" | 23 #include "ui/base/l10n/l10n_util.h" |
24 #include "ui/base/models/combobox_model.h" | 24 #include "ui/base/models/combobox_model.h" |
25 #include "ui/base/resource/resource_bundle.h" | 25 #include "ui/base/resource/resource_bundle.h" |
26 #include "ui/gfx/text_constants.h" | 26 #include "ui/gfx/text_constants.h" |
27 #include "ui/views/bubble/bubble_delegate.h" | 27 #include "ui/views/bubble/bubble_delegate.h" |
28 #include "ui/views/bubble/bubble_frame_view.h" | 28 #include "ui/views/bubble/bubble_frame_view.h" |
29 #include "ui/views/controls/button/checkbox.h" | 29 #include "ui/views/controls/button/checkbox.h" |
30 #include "ui/views/controls/button/label_button.h" | 30 #include "ui/views/controls/button/label_button.h" |
31 #include "ui/views/controls/button/label_button_border.h" | 31 #include "ui/views/controls/button/label_button_border.h" |
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
205 DCHECK(!requests.empty()); | 205 DCHECK(!requests.empty()); |
206 | 206 |
207 RemoveAllChildViews(true); | 207 RemoveAllChildViews(true); |
208 customize_comboboxes_.clear(); | 208 customize_comboboxes_.clear(); |
209 set_close_on_esc(true); | 209 set_close_on_esc(true); |
210 set_close_on_deactivate(false); | 210 set_close_on_deactivate(false); |
211 | 211 |
212 SetLayoutManager(new views::BoxLayout( | 212 SetLayoutManager(new views::BoxLayout( |
213 views::BoxLayout::kVertical, kBubbleOuterMargin, 0, kItemMajorSpacing)); | 213 views::BoxLayout::kVertical, kBubbleOuterMargin, 0, kItemMajorSpacing)); |
214 | 214 |
215 hostname_ = net::FormatUrl(requests[0]->GetRequestingHostname(), | 215 hostname_ = url_formatter::FormatUrl( |
216 languages, | 216 requests[0]->GetRequestingHostname(), languages, |
217 net::kFormatUrlOmitUsernamePassword | | 217 url_formatter::kFormatUrlOmitUsernamePassword | |
218 net::kFormatUrlOmitTrailingSlashOnBareHostname, | 218 url_formatter::kFormatUrlOmitTrailingSlashOnBareHostname, |
219 net::UnescapeRule::SPACES, | 219 net::UnescapeRule::SPACES, nullptr, nullptr, nullptr); |
220 nullptr, nullptr, nullptr); | |
221 | 220 |
222 ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance(); | 221 ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance(); |
223 for (size_t index = 0; index < requests.size(); index++) { | 222 for (size_t index = 0; index < requests.size(); index++) { |
224 DCHECK(index < accept_state.size()); | 223 DCHECK(index < accept_state.size()); |
225 // The row is laid out containing a leading-aligned label area and a | 224 // The row is laid out containing a leading-aligned label area and a |
226 // trailing column which will be filled if there are multiple permission | 225 // trailing column which will be filled if there are multiple permission |
227 // requests. | 226 // requests. |
228 views::View* row = new views::View(); | 227 views::View* row = new views::View(); |
229 views::GridLayout* row_layout = new views::GridLayout(row); | 228 views::GridLayout* row_layout = new views::GridLayout(row); |
230 row->SetLayoutManager(row_layout); | 229 row->SetLayoutManager(row_layout); |
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
482 | 481 |
483 void PermissionBubbleViewViews::Accept() { | 482 void PermissionBubbleViewViews::Accept() { |
484 if (delegate_) | 483 if (delegate_) |
485 delegate_->Accept(); | 484 delegate_->Accept(); |
486 } | 485 } |
487 | 486 |
488 void PermissionBubbleViewViews::Deny() { | 487 void PermissionBubbleViewViews::Deny() { |
489 if (delegate_) | 488 if (delegate_) |
490 delegate_->Deny(); | 489 delegate_->Deny(); |
491 } | 490 } |
OLD | NEW |