Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5270)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_browser.gypi

Issue 5747001: Add the virtual keyboard to BrowserFrameChromeos. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review comments Created 10 years 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
« no previous file with comments | « chrome/browser/ui/views/frame/opaque_browser_frame_view.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 1857edecffe7179f0aa5dfdb10db9289e42402a4..91760a92e0ac6291e9a953d9b4981869ca58b9dd 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -502,6 +502,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',
@@ -3053,6 +3054,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',
@@ -3184,6 +3188,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',
@@ -3508,20 +3514,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', {
@@ -3533,10 +3534,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'],
],
@@ -4204,6 +4208,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'],
@@ -4225,6 +4230,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
« no previous file with comments | « chrome/browser/ui/views/frame/opaque_browser_frame_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698