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

Side by Side Diff: chrome/test/BUILD.gn

Issue 2839933005: mash: Merge ChromeLauncherController and *Impl subclass. (Closed)
Patch Set: Address comments. Created 3 years, 8 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/chrome_build.gni") 5 import("//build/config/chrome_build.gni")
6 import("//build/config/compiler/compiler.gni") 6 import("//build/config/compiler/compiler.gni")
7 import("//build/config/crypto.gni") 7 import("//build/config/crypto.gni")
8 import("//build/config/features.gni") 8 import("//build/config/features.gni")
9 import("//build/config/ui.gni") 9 import("//build/config/ui.gni")
10 import("//chrome/common/features.gni") 10 import("//chrome/common/features.gni")
(...skipping 1920 matching lines...) Expand 10 before | Expand all | Expand 10 after
1931 } 1931 }
1932 1932
1933 if (use_ash) { 1933 if (use_ash) {
1934 sources += [ 1934 sources += [
1935 "../browser/ui/ash/accelerator_commands_browsertest.cc", 1935 "../browser/ui/ash/accelerator_commands_browsertest.cc",
1936 "../browser/ui/ash/accelerator_controller_browsertest.cc", 1936 "../browser/ui/ash/accelerator_controller_browsertest.cc",
1937 "../browser/ui/ash/app_list/app_list_controller_ash_browsertest.cc", 1937 "../browser/ui/ash/app_list/app_list_controller_ash_browsertest.cc",
1938 "../browser/ui/ash/chrome_new_window_client_browsertest.cc", 1938 "../browser/ui/ash/chrome_new_window_client_browsertest.cc",
1939 "../browser/ui/ash/keyboard_controller_browsertest.cc", 1939 "../browser/ui/ash/keyboard_controller_browsertest.cc",
1940 "../browser/ui/ash/keyboard_end_to_end_browsertest.cc", 1940 "../browser/ui/ash/keyboard_end_to_end_browsertest.cc",
1941 "../browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest. cc", 1941 "../browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc",
1942 "../browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc", 1942 "../browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc",
1943 "../browser/ui/ash/multi_user/multi_user_window_manager_test.cc", 1943 "../browser/ui/ash/multi_user/multi_user_window_manager_test.cc",
1944 "../browser/ui/ash/multi_user/multi_user_window_manager_test.h", 1944 "../browser/ui/ash/multi_user/multi_user_window_manager_test.h",
1945 "../browser/ui/ash/networking_config_delegate_chromeos_browsertest.cc", 1945 "../browser/ui/ash/networking_config_delegate_chromeos_browsertest.cc",
1946 "../browser/ui/ash/shelf_browsertest.cc", 1946 "../browser/ui/ash/shelf_browsertest.cc",
1947 "../browser/ui/ash/system_tray_client_browsertest.cc", 1947 "../browser/ui/ash/system_tray_client_browsertest.cc",
1948 "../browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc ", 1948 "../browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc ",
1949 "../browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chrome os.cc", 1949 "../browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chrome os.cc",
1950 "../browser/ui/ash/volume_controller_browsertest.cc", 1950 "../browser/ui/ash/volume_controller_browsertest.cc",
1951 "../browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest .cc", 1951 "../browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest .cc",
(...skipping 2080 matching lines...) Expand 10 before | Expand all | Expand 10 after
4032 "../browser/renderer_context_menu/mock_render_view_context_menu.cc", 4032 "../browser/renderer_context_menu/mock_render_view_context_menu.cc",
4033 "../browser/renderer_context_menu/mock_render_view_context_menu.h", 4033 "../browser/renderer_context_menu/mock_render_view_context_menu.h",
4034 "../browser/renderer_context_menu/open_with_menu_factory_ash_unittest.cc", 4034 "../browser/renderer_context_menu/open_with_menu_factory_ash_unittest.cc",
4035 "../browser/signin/signin_error_notifier_ash_unittest.cc", 4035 "../browser/signin/signin_error_notifier_ash_unittest.cc",
4036 "../browser/sync/sync_error_notifier_ash_unittest.cc", 4036 "../browser/sync/sync_error_notifier_ash_unittest.cc",
4037 4037
4038 # Ash implies the app list is enabled (only disabled on mobile). 4038 # Ash implies the app list is enabled (only disabled on mobile).
4039 "../browser/ui/ash/accessibility/ax_tree_source_aura_unittest.cc", 4039 "../browser/ui/ash/accessibility/ax_tree_source_aura_unittest.cc",
4040 "../browser/ui/ash/chrome_screenshot_grabber_unittest.cc", 4040 "../browser/ui/ash/chrome_screenshot_grabber_unittest.cc",
4041 "../browser/ui/ash/launcher/arc_app_shelf_id_unittest.cc", 4041 "../browser/ui/ash/launcher/arc_app_shelf_id_unittest.cc",
4042 "../browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc", 4042 "../browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc",
4043 "../browser/ui/ash/launcher/launcher_context_menu_unittest.cc", 4043 "../browser/ui/ash/launcher/launcher_context_menu_unittest.cc",
4044 "../browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc ", 4044 "../browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc ",
4045 "../browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_uni ttest.cc", 4045 "../browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_uni ttest.cc",
4046 "../browser/ui/ash/multi_user/multi_user_util_chromeos_unittest.cc", 4046 "../browser/ui/ash/multi_user/multi_user_util_chromeos_unittest.cc",
4047 "../browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest. cc", 4047 "../browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest. cc",
4048 "../browser/ui/ash/multi_user/user_switch_util_unittest.cc", 4048 "../browser/ui/ash/multi_user/user_switch_util_unittest.cc",
4049 "../browser/ui/ash/session_controller_client_unittest.cc", 4049 "../browser/ui/ash/session_controller_client_unittest.cc",
4050 "../browser/ui/ash/window_positioner_unittest.cc", 4050 "../browser/ui/ash/window_positioner_unittest.cc",
4051 "../browser/ui/window_sizer/window_sizer_ash_unittest.cc", 4051 "../browser/ui/window_sizer/window_sizer_ash_unittest.cc",
4052 ] 4052 ]
(...skipping 976 matching lines...) Expand 10 before | Expand all | Expand 10 after
5029 } 5029 }
5030 5030
5031 if (is_win) { 5031 if (is_win) {
5032 loadable_module("conflicts_dll") { 5032 loadable_module("conflicts_dll") {
5033 testonly = true 5033 testonly = true
5034 sources = [ 5034 sources = [
5035 "conflicts/conflicts_dll.cc", 5035 "conflicts/conflicts_dll.cc",
5036 ] 5036 ]
5037 } 5037 }
5038 } 5038 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698