Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("//build/config/crypto.gni") | 5 import("//build/config/crypto.gni") |
| 6 import("//build/config/features.gni") | 6 import("//build/config/features.gni") |
| 7 import("//build/config/ui.gni") | 7 import("//build/config/ui.gni") |
| 8 | 8 |
| 9 gypi_values = exec_script("//build/gypi_to_gn.py", | 9 gypi_values = exec_script("//build/gypi_to_gn.py", |
| 10 [ rebase_path("../../chrome_browser_ui.gypi") ], | 10 [ rebase_path("../../chrome_browser_ui.gypi") ], |
| (...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 221 "//chrome") | 221 "//chrome") |
| 222 deps += [ "//components/constrained_window" ] | 222 deps += [ "//components/constrained_window" ] |
| 223 if (!is_chromeos) { | 223 if (!is_chromeos) { |
| 224 sources += | 224 sources += |
| 225 rebase_path(gypi_values.chrome_browser_ui_views_non_chromeos_sources, | 225 rebase_path(gypi_values.chrome_browser_ui_views_non_chromeos_sources, |
| 226 ".", | 226 ".", |
| 227 "//chrome") | 227 "//chrome") |
| 228 } | 228 } |
| 229 if (is_mac) { | 229 if (is_mac) { |
| 230 if (mac_views_browser) { | 230 if (mac_views_browser) { |
| 231 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.
| |
| 231 sources -= [ | 232 sources -= [ |
| 233 "cocoa/apps/chrome_app_window_client_cocoa.mm", | |
| 232 "cocoa/bookmarks/bookmark_drag_drop_cocoa.mm", | 234 "cocoa/bookmarks/bookmark_drag_drop_cocoa.mm", |
| 233 "cocoa/browser_window_factory_cocoa.mm", | 235 "cocoa/browser_window_factory_cocoa.mm", |
| 234 "cocoa/tab_dialogs_cocoa.mm", | 236 "cocoa/tab_dialogs_cocoa.mm", |
| 235 ] | 237 ] |
| 238 deps += [ "//extensions/components/native_app_window" ] | |
| 236 } else { | 239 } else { |
| 237 sources -= [ | 240 sources -= [ |
| 241 "views/apps/chrome_native_app_window_views.cc", | |
| 242 "views/apps/chrome_native_app_window_views.h", | |
| 243 "views/apps/desktop_keyboard_capture.cc", | |
| 244 "views/apps/desktop_keyboard_capture.h", | |
| 245 "views/apps/keyboard_hook_handler.cc", | |
| 246 "views/apps/keyboard_hook_handler.h", | |
| 238 "views/bookmarks/bookmark_drag_drop_views.cc", | 247 "views/bookmarks/bookmark_drag_drop_views.cc", |
| 248 "views/extensions/extension_keybinding_registry_views.cc", | |
| 249 "views/extensions/extension_keybinding_registry_views.h", | |
| 239 "views/frame/browser_window_factory.cc", | 250 "views/frame/browser_window_factory.cc", |
| 251 "views/frame/taskbar_decorator.cc", | |
| 252 "views/frame/taskbar_decorator.h", | |
| 240 "views/tab_dialogs_views.cc", | 253 "views/tab_dialogs_views.cc", |
| 241 ] | 254 ] |
| 242 } | 255 } |
| 243 } else { | 256 } else { |
| 244 sources += | 257 sources += |
| 245 rebase_path(gypi_values.chrome_browser_ui_views_non_mac_sources, | 258 rebase_path(gypi_values.chrome_browser_ui_views_non_mac_sources, |
| 246 ".", | 259 ".", |
| 247 "//chrome") | 260 "//chrome") |
| 248 deps += [ "//extensions/components/native_app_window" ] | 261 deps += [ "//extensions/components/native_app_window" ] |
| 249 } | 262 } |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 341 [ "//third_party/google_toolbox_for_mac:google_toolbox_for_mac_config" ] | 354 [ "//third_party/google_toolbox_for_mac:google_toolbox_for_mac_config" ] |
| 342 } else { # non-Mac. | 355 } else { # non-Mac. |
| 343 sources += rebase_path(gypi_values.chrome_browser_ui_non_mac_sources, | 356 sources += rebase_path(gypi_values.chrome_browser_ui_non_mac_sources, |
| 344 ".", | 357 ".", |
| 345 "//chrome") | 358 "//chrome") |
| 346 } | 359 } |
| 347 | 360 |
| 348 if (is_win) { | 361 if (is_win) { |
| 349 sources += | 362 sources += |
| 350 rebase_path(gypi_values.chrome_browser_ui_win_sources, ".", "//chrome") | 363 rebase_path(gypi_values.chrome_browser_ui_win_sources, ".", "//chrome") |
| 351 sources -= [ "views/frame/taskbar_decorator.cc" ] | 364 sources -= [ |
| 365 "views/apps/keyboard_hook_handler.cc", | |
| 366 "views/frame/taskbar_decorator.cc", | |
| 367 ] | |
| 352 public_deps += [ | 368 public_deps += [ |
| 353 "//ui/views", | 369 "//ui/views", |
| 354 "//ui/views/controls/webview", | 370 "//ui/views/controls/webview", |
| 355 ] | 371 ] |
| 356 deps += [ | 372 deps += [ |
| 357 "//chrome/browser/metro_utils", | 373 "//chrome/browser/metro_utils", |
| 358 "//chrome/installer/util:strings", | 374 "//chrome/installer/util:strings", |
| 359 "//google_update", | 375 "//google_update", |
| 360 "//third_party/wtl", | 376 "//third_party/wtl", |
| 361 "//third_party/iaccessible2", | 377 "//third_party/iaccessible2", |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 515 "//chrome/browser", | 531 "//chrome/browser", |
| 516 "//content/public/browser", | 532 "//content/public/browser", |
| 517 "//content/public/common", | 533 "//content/public/common", |
| 518 "//content/test:test_support", | 534 "//content/test:test_support", |
| 519 "//net:test_support", | 535 "//net:test_support", |
| 520 "//skia", | 536 "//skia", |
| 521 "//testing/gtest", | 537 "//testing/gtest", |
| 522 "//ui/base", | 538 "//ui/base", |
| 523 ] | 539 ] |
| 524 } | 540 } |
| OLD | NEW |