Merge browser/ui/password and browser/ui/passwords.

chrome/chrome_browser_ui.gypi

 # Copyright 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       'target_name': 'browser_ui',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 1429 matching lines @@
         'browser/ui/panels/panel_mouse_watcher.cc',
         'browser/ui/panels/panel_mouse_watcher.h',
         'browser/ui/panels/panel_mouse_watcher_observer.h',
         'browser/ui/panels/panel_mouse_watcher_timer.cc',
         'browser/ui/panels/stacked_panel_collection.cc',
         'browser/ui/panels/stacked_panel_collection.h',
         'browser/ui/panels/stacked_panel_drag_handler.cc',
         'browser/ui/panels/stacked_panel_drag_handler.h',
         'browser/ui/passwords/manage_passwords_icon_controller.cc',
         'browser/ui/passwords/manage_passwords_icon_controller.h',
-        'browser/ui/password/password_ui_view.h',
+        'browser/ui/passwords/password_manager_presenter.cc',
+        'browser/ui/passwords/password_manager_presenter.h',
+        'browser/ui/passwords/password_ui_view.h',
         'browser/ui/pdf/open_pdf_in_reader_prompt_delegate.h',
         'browser/ui/pdf/pdf_tab_helper.cc',
         'browser/ui/pdf/pdf_tab_helper.h',
         'browser/ui/pdf/pdf_unsupported_feature.cc',
         'browser/ui/pdf/pdf_unsupported_feature.h',
         'browser/ui/prefs/prefs_tab_helper.cc',
         'browser/ui/prefs/prefs_tab_helper.h',
         'browser/ui/profile_error_dialog.cc',
         'browser/ui/profile_error_dialog.h',
         'browser/ui/protocol_dialog_delegate.h',
@@ skipping 977 matching lines @@
         'browser/ui/webui/options/manage_profile_handler.cc',
         'browser/ui/webui/options/manage_profile_handler.h',
         'browser/ui/webui/options/media_devices_selection_handler.cc',
         'browser/ui/webui/options/media_devices_selection_handler.h',
         'browser/ui/webui/options/media_galleries_handler.cc',
         'browser/ui/webui/options/media_galleries_handler.h',
         'browser/ui/webui/options/options_handlers_helper.cc',
         'browser/ui/webui/options/options_handlers_helper.h',
         'browser/ui/webui/options/options_ui.cc',
         'browser/ui/webui/options/options_ui.h',
-        'browser/ui/webui/options/password_manager_presenter.cc',
-        'browser/ui/webui/options/password_manager_presenter.h',
         'browser/ui/webui/options/password_manager_handler.cc',
         'browser/ui/webui/options/password_manager_handler.h',
         'browser/ui/webui/options/pepper_flash_content_settings_utils.cc',
         'browser/ui/webui/options/pepper_flash_content_settings_utils.h',
         'browser/ui/webui/options/reset_profile_settings_handler.cc',
         'browser/ui/webui/options/reset_profile_settings_handler.h',
         'browser/ui/webui/options/search_engine_manager_handler.cc',
         'browser/ui/webui/options/search_engine_manager_handler.h',
         'browser/ui/webui/options/startup_pages_handler.cc',
         'browser/ui/webui/options/startup_pages_handler.h',
@@ skipping 859 matching lines @@
             'browser/ui/webui/local_discovery/local_discovery_ui.cc',
             'browser/ui/webui/local_discovery/local_discovery_ui.h',
             'browser/ui/webui/local_discovery/local_discovery_ui_handler.cc',
             'browser/ui/webui/local_discovery/local_discovery_ui_handler.h',
           ],
         }],
       ],
     },
   ],
 }