Enable WebUI ScreenLocker for aura by abstracting lock window.

chrome/chrome_browser.gypi

 # Copyright (c) 2011 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',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 560 matching lines @@
         'browser/chromeos/login/image_downloader.cc',
         'browser/chromeos/login/image_downloader.h',
         'browser/chromeos/login/issue_response_handler.cc',
         'browser/chromeos/login/issue_response_handler.h',
         'browser/chromeos/login/language_list.cc',
         'browser/chromeos/login/language_list.h',
         'browser/chromeos/login/language_switch_menu.cc',
         'browser/chromeos/login/language_switch_menu.h',
         'browser/chromeos/login/session_manager_observer.cc',
         'browser/chromeos/login/session_manager_observer.h',
+        'browser/chromeos/login/lock_window.h',
+        'browser/chromeos/login/lock_window_aura.cc',
+        'browser/chromeos/login/lock_window_aura.h',
+        'browser/chromeos/login/lock_window_gtk.cc',
+        'browser/chromeos/login/lock_window_gtk.h',
         'browser/chromeos/login/login_display.cc',
         'browser/chromeos/login/login_display.h',
         'browser/chromeos/login/login_display_host.h',
         'browser/chromeos/login/login_html_dialog.cc',
         'browser/chromeos/login/login_html_dialog.h',
         'browser/chromeos/login/login_performer.cc',
         'browser/chromeos/login/login_performer.h',
         'browser/chromeos/login/login_status_consumer.cc',
         'browser/chromeos/login/login_status_consumer.h',
         'browser/chromeos/login/login_utils.cc',
@@ skipping 4419 matching lines @@
                 ['exclude', '^browser/ui/panels/panel_browser_view.cc'],
                 ['exclude', '^browser/ui/panels/panel_browser_view.h'],
               ],
               'sources!': [
                 'browser/ui/toolbar/bookmark_sub_menu_model.cc',
               ],
             }],
             # chromeos notifications are not used in aura.
             ['chromeos==1 and use_aura==0', {
               'sources/': [
+                ['exclude', '^browser/chromeos/login/lock_window_aura.cc'],
+                ['exclude', '^browser/chromeos/login/lock_window_aura.h'],

[oshima, 2011/11/29 20:18:06]

I believe we exclude _aura files for use_aura==0 by default.

[flackr, 2011/11/30 20:16:54]

Done.

                 ['exclude', '^browser/notifications/balloon_collection_impl.cc'],
                 ['exclude', '^browser/notifications/balloon_collection_impl.h'],
                 ['exclude', '^browser/notifications/balloon_collection_views.cc'],
                 ['exclude', '^chromeos/legacy_window_manager/initial_browser_window_observer.cc'],
                 ['exclude', '^chromeos/legacy_window_manager/initial_browser_window_observer.h'],
                 ['exclude', '^browser/download/download_shelf.h'],
                 ['exclude', '^browser/ui/views/download/download_item_view.cc'],
                 ['exclude', '^browser/ui/views/download/download_item_view.h'],
                 ['exclude', '^browser/ui/views/download/download_shelf_context_menu_view.cc'],
                 ['exclude', '^browser/ui/views/download/download_shelf_context_menu_view.h'],
@@ skipping 96 matching lines @@
             ['include', '^browser/ui/views/frame/browser_non_client_frame_view_aura.h'],
             ['include', '^browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc'],
             ['include', '^browser/ui/views/importer/import_lock_dialog_view.cc'],
             ['include', '^browser/ui/views/native_constrained_window_aura.cc'],
             ['include', '^browser/ui/views/stubs_aura.cc'],
           ],
         }],
         # Build Aura with ChromeOS.
         ['use_aura==1 and chromeos==1', {
           'sources/': [
-            ['exclude', '^browser/chromeos/browser/chromeos/login/screen_locker.cc'],
+            ['exclude', '^browser/chromeos/login/lock_window_gtk.cc'],
+            ['exclude', '^browser/chromeos/login/lock_window_gtk.h'],

[oshima, 2011/11/29 20:18:06]

same _gtk is excluded for non gtk build, unless it's included explicitly
somewhere.

[flackr, 2011/11/30 20:16:54]

Done.

             ['exclude', '^browser/chromeos/frame/'],
             ['exclude', '^browser/chromeos/legacy_window_manager/wm_ipc.cc'],
             ['exclude', '^browser/chromeos/legacy_window_manager/wm_message_listener.cc'],
             ['exclude', '^browser/chromeos/login/background_view.cc'],
             ['exclude', '^browser/chromeos/login/screen_locker_browsertest.cc'],
             ['exclude', '^browser/chromeos/login/screen_locker_views.cc'],
-            ['exclude', '^browser/chromeos/login/screen_locker.cc'],
             ['exclude', '^browser/chromeos/login/screen_lock_view.cc'],
             ['exclude', '^browser/chromeos/login/shutdown_button.cc'],
             ['exclude', '^browser/chromeos/login/username_view.cc'],
             ['exclude', '^browser/chromeos/login/user_view.cc'],
             ['exclude', '^browser/chromeos/login/views_login_display.cc'],
             ['exclude', '^browser/chromeos/login/views_login_display_host.cc'],
-            ['exclude', '^browser/chromeos/login/webui_screen_locker.cc'],
             ['exclude', '^browser/chromeos/login/wizard_in_process_browser_test.cc'],
             ['exclude', '^browser/chromeos/notifications/'],
             ['include', '^browser/ui/views/handle_web_keyboard_event_aura.cc'],
             ['include', '^browser/ui/views/handle_web_keyboard_event.h'],
           ],
         }],
         [ 'use_openssl==1', {
           'sources!': [
             'browser/importer/nss_decryptor.cc',
             'browser/importer/nss_decryptor_system_nss.cc',
@@ skipping 88 matching lines @@
       'type': 'static_library',
       'sources': [ 'browser/history/in_memory_url_index_cache.proto' ],
       'variables': {
         'proto_in_dir': 'browser/history',
         'proto_out_dir': 'chrome/browser/history',
       },
       'includes': [ '../build/protoc.gypi' ]
     },
   ],
 }