Add the virtual keyboard to BrowserFrameChromeos.
BUG=none
TEST=focusing a text field shows the placeholder keyboard
Review URL: http://codereview.chromium.org/5747001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69142 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index c02ea1e..5a6fbb7 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -514,6 +514,7 @@
'browser/chromeos/external_protocol_dialog.h',
'browser/chromeos/frame/browser_frame_chromeos.cc',
'browser/chromeos/frame/browser_frame_chromeos.h',
+ 'browser/chromeos/frame/browser_non_client_frame_view_factory_chromeos.cc',
'browser/chromeos/frame/browser_view.cc',
'browser/chromeos/frame/browser_view.h',
'browser/chromeos/frame/bubble_frame_view.cc',
@@ -3080,6 +3081,9 @@
'browser/ui/toolbar/toolbar_model.h',
'browser/ui/toolbar/wrench_menu_model.cc',
'browser/ui/toolbar/wrench_menu_model.h',
+ 'browser/ui/touch/frame/browser_non_client_frame_view_factory_touch.cc',
+ 'browser/ui/touch/frame/touch_browser_frame_view.cc',
+ 'browser/ui/touch/frame/touch_browser_frame_view.h',
'browser/ui/view_ids.h',
'browser/ui/views/about_chrome_view.cc',
'browser/ui/views/about_chrome_view.h',
@@ -3211,6 +3215,8 @@
'browser/ui/views/frame/browser_frame_win.cc',
'browser/ui/views/frame/browser_frame_win.h',
'browser/ui/views/frame/browser_non_client_frame_view.h',
+ 'browser/ui/views/frame/browser_non_client_frame_view_factory_gtk.cc',
+ 'browser/ui/views/frame/browser_non_client_frame_view_factory_win.cc',
'browser/ui/views/frame/browser_root_view.cc',
'browser/ui/views/frame/browser_root_view.h',
'browser/ui/views/frame/browser_view.cc',
@@ -3535,20 +3541,15 @@
],
}],
['touchui==0', {
- 'sources!': [
- 'browser/chromeos/dom_ui/login/authenticator_facade.h',
- 'browser/chromeos/dom_ui/login/authenticator_facade_stub.cc',
- 'browser/chromeos/dom_ui/login/authenticator_facade_stub.h',
- 'browser/chromeos/dom_ui/login/login_ui.cc',
- 'browser/chromeos/dom_ui/login/login_ui.h',
- 'browser/chromeos/dom_ui/login/login_ui_helpers.cc',
- 'browser/chromeos/dom_ui/login/login_ui_helpers.h',
- 'browser/dom_ui/keyboard_ui.cc',
- 'browser/dom_ui/keyboard_ui.h',
- 'browser/renderer_host/render_widget_host_view_views.cc',
- 'browser/renderer_host/render_widget_host_view_views.h',
- 'browser/ui/views/tab_contents/tab_contents_view_views.cc',
- 'browser/ui/views/tab_contents/tab_contents_view_views.h',
+ 'sources/': [
+ ['exclude', '^browser/chromeos/dom_ui/login/authenticator_facade.h$'],
+ ['exclude', '^browser/chromeos/dom_ui/login/authenticator_facade_stub.*'],
+ ['exclude', '^browser/chromeos/dom_ui/login/login_ui.*'],
+ ['exclude', '^browser/chromeos/dom_ui/login/login_ui_helpers.*'],
+ ['exclude', '^browser/dom_ui/keyboard_ui.*'],
+ ['exclude', '^browser/renderer_host/render_widget_host_view_views.*'],
+ ['exclude', '^browser/ui/touch/*'],
+ ['exclude', '^browser/ui/views/tab_contents/tab_contents_view_views.*'],
],
}],
['touchui==1', {
@@ -3560,10 +3561,13 @@
['include', 'browser/chromeos/dom_ui/login/login_ui.h'],
['include', 'browser/chromeos/dom_ui/login/login_ui_helpers.cc'],
['include', 'browser/chromeos/dom_ui/login/login_ui_helpers.h'],
+ ['include', '^browser/ui/touch/*'],
+ ['exclude', '^browser/chromeos/frame/browser_non_client_frame_view_factory_chromeos.cc'],
['exclude', '^browser/renderer_host/render_widget_host_view_gtk.cc'],
['exclude', '^browser/renderer_host/render_widget_host_view_gtk.h'],
['exclude', '^browser/renderer_host/gtk_im_context_wrapper.cc'],
['exclude', '^browser/renderer_host/gtk_im_context_wrapper.h'],
+ ['exclude', '^browser/ui/views/frame/browser_non_client_frame_view_factory_gtk.cc'],
['exclude', '^browser/views/tab_contents/tab_contents_view_gtk.cc'],
['exclude', '^browser/views/tab_contents/tab_contents_view_gtk.h'],
],
@@ -4229,6 +4233,7 @@
['include', '^browser/gtk/external_protocol_dialog_gtk.h'],
['include', '^browser/ui/views/notifications/balloon_view.cc'],
['include', '^browser/ui/views/notifications/balloon_view.h'],
+ ['include', '^browser/ui/views/frame/browser_non_client_frame_view_factory_gtk.cc'],
['exclude', '^browser/ui/views/keyboard_overlay_delegate.cc'],
['exclude', '^browser/ui/views/keyboard_overlay_delegate.h'],
['exclude', '^browser/ui/views/select_file_dialog.cc'],
@@ -4250,6 +4255,7 @@
'sources/': [
['include', '^browser/ui/views/tab_contents/tab_contents_view_views.cc'],
['include', '^browser/ui/views/tab_contents/tab_contents_view_views.h'],
+ ['exclude', '^browser/ui/views/frame/browser_non_client_frame_view_factory_gtk.cc'],
['exclude', '^browser/ui/views/tab_contents/tab_contents_view_gtk.cc'],
['exclude', '^browser/ui/views/tab_contents/tab_contents_view_gtk.h'],
# TODO(anicolao): exclude these once we have DOMUI dialogs
