| Index: chrome/chrome_browser.gypi
|
| diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
|
| index ffbb69379ab3b2b40ec2159403f111c21e4d3f4e..0e5c33c2a77e60b2475d856f06d91e4e8738c71f 100644
|
| --- a/chrome/chrome_browser.gypi
|
| +++ b/chrome/chrome_browser.gypi
|
| @@ -768,8 +768,6 @@
|
| 'browser/cocoa/fullscreen_controller.mm',
|
| 'browser/cocoa/fullscreen_window.h',
|
| 'browser/cocoa/fullscreen_window.mm',
|
| - 'browser/cocoa/geolocation_exceptions_window_controller.h',
|
| - 'browser/cocoa/geolocation_exceptions_window_controller.mm',
|
| 'browser/cocoa/gradient_button_cell.h',
|
| 'browser/cocoa/gradient_button_cell.mm',
|
| 'browser/cocoa/history_menu_bridge.h',
|
| @@ -867,6 +865,8 @@
|
| 'browser/cocoa/side_tab_strip_controller.mm',
|
| 'browser/cocoa/side_tab_strip_view.h',
|
| 'browser/cocoa/side_tab_strip_view.mm',
|
| + 'browser/cocoa/simple_content_exceptions_window_controller.h',
|
| + 'browser/cocoa/simple_content_exceptions_window_controller.mm',
|
| 'browser/cocoa/status_bubble_mac.h',
|
| 'browser/cocoa/status_bubble_mac.mm',
|
| 'browser/cocoa/status_icons/status_icon_mac.h',
|
| @@ -1484,8 +1484,6 @@
|
| 'browser/gtk/options/fonts_languages_window_gtk.cc',
|
| 'browser/gtk/options/fonts_page_gtk.cc',
|
| 'browser/gtk/options/fonts_page_gtk.h',
|
| - 'browser/gtk/options/geolocation_content_exceptions_window.cc',
|
| - 'browser/gtk/options/geolocation_content_exceptions_window.h',
|
| 'browser/gtk/options/general_page_gtk.cc',
|
| 'browser/gtk/options/general_page_gtk.h',
|
| 'browser/gtk/options/languages_page_gtk.cc',
|
| @@ -1501,6 +1499,8 @@
|
| 'browser/gtk/options/passwords_exceptions_window_gtk.h',
|
| 'browser/gtk/options/passwords_page_gtk.cc',
|
| 'browser/gtk/options/passwords_page_gtk.h',
|
| + 'browser/gtk/options/simple_content_exceptions_window.cc',
|
| + 'browser/gtk/options/simple_content_exceptions_window.h',
|
| 'browser/gtk/options/url_picker_dialog_gtk.cc',
|
| 'browser/gtk/options/url_picker_dialog_gtk.h',
|
| 'browser/gtk/page_info_window_gtk.cc',
|
| @@ -2591,8 +2591,6 @@
|
| 'browser/views/options/fonts_page_view.h',
|
| 'browser/views/options/general_page_view.cc',
|
| 'browser/views/options/general_page_view.h',
|
| - 'browser/views/options/geolocation_exceptions_view.cc',
|
| - 'browser/views/options/geolocation_exceptions_view.h',
|
| 'browser/views/options/languages_page_view.cc',
|
| 'browser/views/options/languages_page_view.h',
|
| 'browser/views/options/options_group_view.cc',
|
| @@ -2606,6 +2604,8 @@
|
| 'browser/views/options/passwords_page_view.h',
|
| 'browser/views/options/plugin_filter_page_view.cc',
|
| 'browser/views/options/plugin_filter_page_view.h',
|
| + 'browser/views/options/simple_content_exceptions_view.cc',
|
| + 'browser/views/options/simple_content_exceptions_view.h',
|
| 'browser/views/page_info_window_view.cc',
|
| 'browser/views/pinned_contents_info_bubble.cc',
|
| 'browser/views/pinned_contents_info_bubble.h',
|
| @@ -2953,7 +2953,6 @@
|
| 'app/nibs/FirstRunBubble.xib',
|
| 'app/nibs/FirstRunDialog.xib',
|
| 'app/nibs/FontLanguageSettings.xib',
|
| - 'app/nibs/GeolocationExceptionsWindow.xib',
|
| 'app/nibs/HttpAuthLoginSheet.xib',
|
| 'app/nibs/HungRendererDialog.xib',
|
| 'app/nibs/ImportSettingsDialog.xib',
|
| @@ -2964,6 +2963,7 @@
|
| 'app/nibs/ReportBug.xib',
|
| 'app/nibs/SadTab.xib',
|
| 'app/nibs/SaveAccessoryView.xib',
|
| + 'app/nibs/SimpleContentExceptionsWindow.xib',
|
| 'app/nibs/SyncCustomize.xib',
|
| 'app/nibs/TaskManager.xib',
|
| 'app/nibs/Toolbar.xib',
|
|
|