chrome/chrome_browser.gypi - Issue 6973029: Integrate WebUI Login with cros.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/chrome_browser.gypi

Issue 6973029: Integrate WebUI Login with cros. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Removed ResetXCursor and did_paint_and fixed segfault in WebUILoginView Created 9 years, 7 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:

Index: chrome/chrome_browser.gypi

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

index d1c0605fe64f8f2d13a9a7973fd14ee95d13f5f4..cfc73ed321b5cfb5240346da3545c5c4405402e2 100644

--- a/chrome/chrome_browser.gypi

+++ b/chrome/chrome_browser.gypi

@@ -427,12 +427,6 @@

'browser/chromeos/frame/bubble_frame_view.h',

'browser/chromeos/frame/bubble_window.cc',

'browser/chromeos/frame/bubble_window.h',

- 'browser/chromeos/frame/dom_browser.cc',

- 'browser/chromeos/frame/dom_browser.h',

- 'browser/chromeos/frame/dom_browser_view.cc',

- 'browser/chromeos/frame/dom_browser_view.h',

- 'browser/chromeos/frame/dom_browser_view_layout.cc',

- 'browser/chromeos/frame/dom_browser_view_layout.h',

'browser/chromeos/frame/panel_browser_view.cc',

'browser/chromeos/frame/panel_browser_view.h',

'browser/chromeos/frame/panel_controller.cc',

@@ -607,6 +601,8 @@

'browser/chromeos/login/web_page_screen.h',

'browser/chromeos/login/web_page_view.cc',

'browser/chromeos/login/web_page_view.h',

+ 'browser/chromeos/login/webui_login_view.h',

+ 'browser/chromeos/login/webui_login_view.cc',

'browser/chromeos/login/wizard_accessibility_handler.cc',

'browser/chromeos/login/wizard_accessibility_handler.h',

'browser/chromeos/login/wizard_accessibility_helper.cc',

@@ -3567,6 +3563,7 @@

'sources/': [

['exclude', '^browser/chromeos/frame/dom_*'],

['exclude', '^browser/chromeos/login/dom_*'],

+ ['exclude', '^browser/chromeos/login/webui_*'],

['exclude', '^browser/extensions/extension_input_ui_api.cc'],

['exclude', '^browser/extensions/extension_input_ui_api.h'],

['exclude', '^browser/webui/keyboard_ui.*'],