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

Unified Diff: chrome/browser/ui/BUILD.gn

Issue 935193003: [Mac] Use chrome_native_app_window_views when mac_views_browser is enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename chrome_apps_client to chrome_app_window_client. Created 5 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 | « no previous file | chrome/browser/ui/views/apps/chrome_app_window_client_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/BUILD.gn
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index 06fbfa45055d2815bbe7a5ef5f549f86f57f83a8..d272da74c12dd60f9401f9cba8eafba5ac23185c 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -228,15 +228,28 @@ static_library("ui") {
}
if (is_mac) {
if (mac_views_browser) {
+ sources += [ "views/apps/chrome_apps_client_views_mac.mm" ]
tapted 2015/03/01 23:15:07 views/apps/chrome_app_window_client_views_mac.mm
jackhou1 2015/03/01 23:43:00 Done.
sources -= [
+ "cocoa/apps/chrome_app_window_client_cocoa.mm",
"cocoa/bookmarks/bookmark_drag_drop_cocoa.mm",
"cocoa/browser_window_factory_cocoa.mm",
"cocoa/tab_dialogs_cocoa.mm",
]
+ deps += [ "//extensions/components/native_app_window" ]
} else {
sources -= [
+ "views/apps/chrome_native_app_window_views.cc",
+ "views/apps/chrome_native_app_window_views.h",
+ "views/apps/desktop_keyboard_capture.cc",
+ "views/apps/desktop_keyboard_capture.h",
+ "views/apps/keyboard_hook_handler.cc",
+ "views/apps/keyboard_hook_handler.h",
"views/bookmarks/bookmark_drag_drop_views.cc",
+ "views/extensions/extension_keybinding_registry_views.cc",
+ "views/extensions/extension_keybinding_registry_views.h",
"views/frame/browser_window_factory.cc",
+ "views/frame/taskbar_decorator.cc",
+ "views/frame/taskbar_decorator.h",
"views/tab_dialogs_views.cc",
]
}
@@ -348,7 +361,10 @@ static_library("ui") {
if (is_win) {
sources +=
rebase_path(gypi_values.chrome_browser_ui_win_sources, ".", "//chrome")
- sources -= [ "views/frame/taskbar_decorator.cc" ]
+ sources -= [
+ "views/apps/keyboard_hook_handler.cc",
+ "views/frame/taskbar_decorator.cc",
+ ]
public_deps += [
"//ui/views",
"//ui/views/controls/webview",
« no previous file with comments | « no previous file | chrome/browser/ui/views/apps/chrome_app_window_client_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698