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

Unified Diff: chrome/chrome_browser_ui.gypi

Issue 160573002: Move root_window_host* in aura to window_tree_host*. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 10 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/tabs/dock_info_win.cc ('k') | mojo/examples/aura_demo/aura_demo.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser_ui.gypi
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 9408442cf4a2b4193b91b6b8c5466b63f9249ecf..bb71cd9c3ac1d8b6ab5498c133a0880049a59e37 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -1902,11 +1902,11 @@
'browser/ui/views/frame/desktop_browser_frame_aura.h',
'browser/ui/views/frame/desktop_user_action_handler_aura.cc',
'browser/ui/views/frame/desktop_user_action_handler_aura.h',
- 'browser/ui/views/frame/browser_desktop_root_window_host.h',
- 'browser/ui/views/frame/browser_desktop_root_window_host_win.cc',
- 'browser/ui/views/frame/browser_desktop_root_window_host_win.h',
- 'browser/ui/views/frame/browser_desktop_root_window_host_x11.cc',
- 'browser/ui/views/frame/browser_desktop_root_window_host_x11.h',
+ 'browser/ui/views/frame/browser_desktop_window_tree_host.h',
+ 'browser/ui/views/frame/browser_desktop_window_tree_host_win.cc',
+ 'browser/ui/views/frame/browser_desktop_window_tree_host_win.h',
+ 'browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc',
+ 'browser/ui/views/frame/browser_desktop_window_tree_host_x11.h',
'browser/ui/views/frame/glass_browser_frame_view.cc',
'browser/ui/views/frame/glass_browser_frame_view.h',
'browser/ui/views/frame/global_menu_bar_x11.cc',
@@ -2839,8 +2839,8 @@
'browser/ui/views/chrome_views_delegate_aura.cc',
'browser/ui/views/external_protocol_dialog.cc',
'browser/ui/views/external_protocol_dialog.h',
- 'browser/ui/views/frame/browser_desktop_root_window_host_x11.cc',
- 'browser/ui/views/frame/browser_desktop_root_window_host_x11.h',
+ 'browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc',
+ 'browser/ui/views/frame/browser_desktop_window_tree_host_x11.h',
'browser/ui/views/frame/desktop_browser_frame_aura.cc',
'browser/ui/views/frame/desktop_browser_frame_aura.h',
'browser/ui/views/frame/desktop_user_action_handler_aura.cc',
@@ -2960,11 +2960,11 @@
],
}, { # else: use_aura==0
'sources/': [
- ['exclude', '^browser/ui/views/frame/browser_desktop_root_window_host.h'],
- ['exclude', '^browser/ui/views/frame/browser_desktop_root_window_host_win.cc'],
- ['exclude', '^browser/ui/views/frame/browser_desktop_root_window_host_win.h'],
- ['exclude', '^browser/ui/views/frame/browser_desktop_root_window_host_x11.cc'],
- ['exclude', '^browser/ui/views/frame/browser_desktop_root_window_host_x11.h'],
+ ['exclude', '^browser/ui/views/frame/browser_desktop_window_tree_host.h'],
+ ['exclude', '^browser/ui/views/frame/browser_desktop_window_tree_host_win.cc'],
+ ['exclude', '^browser/ui/views/frame/browser_desktop_window_tree_host_win.h'],
+ ['exclude', '^browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc'],
+ ['exclude', '^browser/ui/views/frame/browser_desktop_window_tree_host_x11.h'],
['exclude', '^browser/ui/views/theme_image_mapper_aura_win.cc'],
['exclude', '^browser/ui/webui/gesture_config_ui.cc'],
['exclude', '^browser/ui/webui/gesture_config_ui.h'],
« no previous file with comments | « chrome/browser/ui/views/tabs/dock_info_win.cc ('k') | mojo/examples/aura_demo/aura_demo.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698