chrome/chrome_browser.gypi - Issue 8711003: Enable WebUI ScreenLocker for aura by abstracting lock window.

Unified Diff: chrome/chrome_browser.gypi

Issue 8711003: Enable WebUI ScreenLocker for aura by abstracting lock window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Make virtual constructors private and fix order of lock window initialization. Created 9 years, 1 month 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.gypi

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi

index e6964650ac2d1e2dd4c17a5ec77baad0a6cf6aa1..391ef36b89166c2f2918fb3bf42a129063845b9e 100644

--- a/chrome/chrome_browser.gypi

+++ b/chrome/chrome_browser.gypi

@@ -578,6 +578,11 @@

'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',

@@ -5017,6 +5022,8 @@

# 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 b

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'],

@@ -5133,21 +5140,20 @@

# 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

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'],

« chrome/browser/chromeos/login/screen_locker.cc ('K') | « chrome/browser/chromeos/login/webui_screen_locker.cc ('k') | no next file » | no next file with comments »