Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1704)

Unified Diff: chrome/chrome_browser_ui.gypi

Issue 1280673003: [Mac] Enable MacViews site settings bubble behind --enable-mac-views-dialogs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@enabledialogs
Patch Set: Address comments. Created 5 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/chrome_browser_ui.gypi
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 15003e5c544c89e0a308a239d3c22f90d7c9d155..7f470b6c4fe3f71c0710fc860a76a423854e09e1 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -1997,12 +1997,17 @@
'browser/ui/views/apps/keyboard_hook_handler.h',
'browser/ui/views/apps/native_app_window_frame_view_mac.h',
'browser/ui/views/apps/native_app_window_frame_view_mac.mm',
+ 'browser/ui/views/browser_dialogs_views_mac.cc',
'browser/ui/views/chrome_browser_main_extra_parts_views.cc',
'browser/ui/views/chrome_browser_main_extra_parts_views.h',
'browser/ui/views/chrome_constrained_window_views_client.cc',
'browser/ui/views/chrome_constrained_window_views_client.h',
'browser/ui/views/chrome_views_delegate.cc',
'browser/ui/views/chrome_views_delegate.h',
+ 'browser/ui/views/collected_cookies_views.cc',
+ 'browser/ui/views/collected_cookies_views.h',
+ 'browser/ui/views/cookie_info_view.cc',
+ 'browser/ui/views/cookie_info_view.h',
'browser/ui/views/extensions/extension_keybinding_registry_views.cc',
'browser/ui/views/extensions/extension_keybinding_registry_views.h',
'browser/ui/views/frame/native_widget_mac_frameless_nswindow.h',
@@ -2010,6 +2015,13 @@
'browser/ui/views/login_prompt_views.cc',
'browser/ui/views/login_view.cc',
'browser/ui/views/login_view.h',
+ 'browser/ui/views/website_settings/permission_selector_view.cc',
+ 'browser/ui/views/website_settings/permission_selector_view.h',
+ 'browser/ui/views/website_settings/permission_selector_view_observer.h',
+ 'browser/ui/views/website_settings/permissions_bubble_view.cc',
+ 'browser/ui/views/website_settings/permissions_bubble_view.h',
+ 'browser/ui/views/website_settings/website_settings_popup_view.cc',
+ 'browser/ui/views/website_settings/website_settings_popup_view.h',
],
# Views files for everywhere but ChromeOS.
'chrome_browser_ui_views_non_chromeos_sources': [
@@ -2093,8 +2105,6 @@
'browser/ui/views/chrome_javascript_native_dialog_factory_views.cc',
'browser/ui/views/chrome_views_delegate_chromeos.cc',
'browser/ui/views/chrome_web_dialog_view.cc',
- 'browser/ui/views/collected_cookies_views.cc',
- 'browser/ui/views/collected_cookies_views.h',
'browser/ui/views/color_chooser_aura.cc',
'browser/ui/views/color_chooser_aura.h',
'browser/ui/views/color_chooser_win.cc',
@@ -2105,8 +2115,6 @@
'browser/ui/views/constrained_web_dialog_delegate_views.cc',
'browser/ui/views/content_setting_bubble_contents.cc',
'browser/ui/views/content_setting_bubble_contents.h',
- 'browser/ui/views/cookie_info_view.cc',
- 'browser/ui/views/cookie_info_view.h',
'browser/ui/views/create_application_shortcut_view.cc',
'browser/ui/views/create_application_shortcut_view.h',
'browser/ui/views/critical_notification_bubble_view.cc',
@@ -2403,13 +2411,6 @@
'browser/ui/views/validation_message_bubble_view.cc',
'browser/ui/views/validation_message_bubble_view.h',
'browser/ui/views/web_contents_modal_dialog_manager_views.cc',
- 'browser/ui/views/website_settings/permission_selector_view.cc',
- 'browser/ui/views/website_settings/permission_selector_view.h',
- 'browser/ui/views/website_settings/permission_selector_view_observer.h',
- 'browser/ui/views/website_settings/permissions_bubble_view.cc',
- 'browser/ui/views/website_settings/permissions_bubble_view.h',
- 'browser/ui/views/website_settings/website_settings_popup_view.cc',
- 'browser/ui/views/website_settings/website_settings_popup_view.h',
],
'chrome_browser_ui_views_extensions_non_mac_sources': [
'browser/ui/views/extensions/bookmark_app_bubble_view.cc',
« no previous file with comments | « chrome/browser/ui/views/website_settings/website_settings_popup_view.cc ('k') | ui/views/bubble/bubble_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698