| 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 #import "chrome/browser/ui/cocoa/website_settings/website_settings_bubble_contro
ller.h" | 5 #import "chrome/browser/ui/cocoa/website_settings/website_settings_bubble_contro
ller.h" |
| 6 | 6 |
| 7 #import <AppKit/AppKit.h> | 7 #import <AppKit/AppKit.h> |
| 8 | 8 |
| 9 #include <cmath> | 9 #include <cmath> |
| 10 | 10 |
| 11 #include "base/i18n/rtl.h" | 11 #include "base/i18n/rtl.h" |
| 12 #include "base/mac/bind_objc_block.h" | 12 #include "base/mac/bind_objc_block.h" |
| 13 #include "base/memory/ptr_util.h" | 13 #include "base/memory/ptr_util.h" |
| 14 #include "base/strings/sys_string_conversions.h" | 14 #include "base/strings/sys_string_conversions.h" |
| 15 #import "chrome/browser/certificate_viewer.h" | 15 #import "chrome/browser/certificate_viewer.h" |
| 16 #include "chrome/browser/infobars/infobar_service.h" | 16 #include "chrome/browser/infobars/infobar_service.h" |
| 17 #include "chrome/browser/profiles/profile.h" | 17 #include "chrome/browser/profiles/profile.h" |
| 18 #include "chrome/browser/ui/browser_dialogs.h" | 18 #include "chrome/browser/ui/browser_dialogs.h" |
| 19 #import "chrome/browser/ui/cocoa/browser_window_controller.h" | 19 #import "chrome/browser/ui/cocoa/browser_window_controller.h" |
| 20 #import "chrome/browser/ui/cocoa/info_bubble_view.h" | 20 #import "chrome/browser/ui/cocoa/info_bubble_view.h" |
| 21 #import "chrome/browser/ui/cocoa/info_bubble_window.h" | 21 #import "chrome/browser/ui/cocoa/info_bubble_window.h" |
| 22 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" | 22 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" |
| 23 #import "chrome/browser/ui/cocoa/website_settings/permission_selector_button.h" | 23 #import "chrome/browser/ui/cocoa/website_settings/permission_selector_button.h" |
| 24 #include "chrome/browser/ui/page_info/permission_menu_model.h" |
| 24 #import "chrome/browser/ui/tab_dialogs.h" | 25 #import "chrome/browser/ui/tab_dialogs.h" |
| 25 #include "chrome/browser/ui/website_settings/permission_menu_model.h" | |
| 26 #include "chrome/common/url_constants.h" | 26 #include "chrome/common/url_constants.h" |
| 27 #include "chrome/grit/chromium_strings.h" | 27 #include "chrome/grit/chromium_strings.h" |
| 28 #include "chrome/grit/generated_resources.h" | 28 #include "chrome/grit/generated_resources.h" |
| 29 #include "chrome/grit/theme_resources.h" | 29 #include "chrome/grit/theme_resources.h" |
| 30 #include "components/strings/grit/components_chromium_strings.h" | 30 #include "components/strings/grit/components_chromium_strings.h" |
| 31 #include "components/strings/grit/components_strings.h" | 31 #include "components/strings/grit/components_strings.h" |
| 32 #include "content/public/browser/page_navigator.h" | 32 #include "content/public/browser/page_navigator.h" |
| 33 #include "content/public/browser/ssl_host_state_delegate.h" | 33 #include "content/public/browser/ssl_host_state_delegate.h" |
| 34 #include "content/public/browser/user_metrics.h" | 34 #include "content/public/browser/user_metrics.h" |
| 35 #include "content/public/browser/web_contents.h" | 35 #include "content/public/browser/web_contents.h" |
| (...skipping 1176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1212 const CookieInfoList& cookie_info_list) { | 1212 const CookieInfoList& cookie_info_list) { |
| 1213 [bubble_controller_ setCookieInfo:cookie_info_list]; | 1213 [bubble_controller_ setCookieInfo:cookie_info_list]; |
| 1214 } | 1214 } |
| 1215 | 1215 |
| 1216 void WebsiteSettingsUIBridge::SetPermissionInfo( | 1216 void WebsiteSettingsUIBridge::SetPermissionInfo( |
| 1217 const PermissionInfoList& permission_info_list, | 1217 const PermissionInfoList& permission_info_list, |
| 1218 ChosenObjectInfoList chosen_object_info_list) { | 1218 ChosenObjectInfoList chosen_object_info_list) { |
| 1219 [bubble_controller_ setPermissionInfo:permission_info_list | 1219 [bubble_controller_ setPermissionInfo:permission_info_list |
| 1220 andChosenObjects:std::move(chosen_object_info_list)]; | 1220 andChosenObjects:std::move(chosen_object_info_list)]; |
| 1221 } | 1221 } |
| OLD | NEW |