Commit cfe90f57 authored by mgiuca@chromium.org's avatar mgiuca@chromium.org

Moved app_list_service_linux to chrome/browser/ui/views.

For DEPS reasons (this file needs to reference the views directory in an
upcoming CL).

BUG=299250

Review URL: https://codereview.chromium.org/60323007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233526 0039d316-1c4b-4281-b951-d872f2087c98
parent 7eaa1d90
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "chrome/browser/ui/app_list/app_list_service_linux.h" #include "chrome/browser/ui/views/app_list/linux/app_list_service_linux.h"
#include "base/memory/singleton.h" #include "base/memory/singleton.h"
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef CHROME_BROWSER_UI_APP_LIST_APP_LIST_SERVICE_LINUX_H_ #ifndef CHROME_BROWSER_UI_VIEWS_APP_LIST_LINUX_APP_LIST_SERVICE_LINUX_H_
#define CHROME_BROWSER_UI_APP_LIST_APP_LIST_SERVICE_LINUX_H_ #define CHROME_BROWSER_UI_VIEWS_APP_LIST_LINUX_APP_LIST_SERVICE_LINUX_H_
#include "chrome/browser/ui/app_list/app_list_service_impl.h" #include "chrome/browser/ui/app_list/app_list_service_impl.h"
...@@ -38,4 +38,4 @@ class AppListServiceLinux : public AppListServiceImpl { ...@@ -38,4 +38,4 @@ class AppListServiceLinux : public AppListServiceImpl {
DISALLOW_COPY_AND_ASSIGN(AppListServiceLinux); DISALLOW_COPY_AND_ASSIGN(AppListServiceLinux);
}; };
#endif // CHROME_BROWSER_UI_APP_LIST_APP_LIST_SERVICE_LINUX_H_ #endif // CHROME_BROWSER_UI_VIEWS_APP_LIST_LINUX_APP_LIST_SERVICE_LINUX_H_
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "chrome/browser/ui/app_list/app_list_service_linux.h"
#include "chrome/browser/ui/app_list/test/app_list_service_test_api.h" #include "chrome/browser/ui/app_list/test/app_list_service_test_api.h"
#include "chrome/browser/ui/views/app_list/linux/app_list_service_linux.h"
namespace test { namespace test {
namespace { namespace {
......
...@@ -135,8 +135,6 @@ ...@@ -135,8 +135,6 @@
'browser/ui/app_list/app_list_service_disabled.cc', 'browser/ui/app_list/app_list_service_disabled.cc',
'browser/ui/app_list/app_list_service_impl.cc', 'browser/ui/app_list/app_list_service_impl.cc',
'browser/ui/app_list/app_list_service_impl.h', 'browser/ui/app_list/app_list_service_impl.h',
'browser/ui/app_list/app_list_service_linux.cc',
'browser/ui/app_list/app_list_service_linux.h',
'browser/ui/app_list/app_list_service_mac.h', 'browser/ui/app_list/app_list_service_mac.h',
'browser/ui/app_list/app_list_service_mac.mm', 'browser/ui/app_list/app_list_service_mac.mm',
'browser/ui/app_list/app_list_shower.cc', 'browser/ui/app_list/app_list_shower.cc',
...@@ -1622,6 +1620,8 @@ ...@@ -1622,6 +1620,8 @@
'browser/ui/views/accessibility/invert_bubble_view.h', 'browser/ui/views/accessibility/invert_bubble_view.h',
'browser/ui/views/app_menu_button_win.cc', 'browser/ui/views/app_menu_button_win.cc',
'browser/ui/views/app_menu_button_win.h', 'browser/ui/views/app_menu_button_win.h',
'browser/ui/views/app_list/linux/app_list_service_linux.cc',
'browser/ui/views/app_list/linux/app_list_service_linux.h',
'browser/ui/views/app_list/win/activation_tracker_win.cc', 'browser/ui/views/app_list/win/activation_tracker_win.cc',
'browser/ui/views/app_list/win/activation_tracker_win.h', 'browser/ui/views/app_list/win/activation_tracker_win.h',
'browser/ui/views/app_list/win/app_list_controller_delegate_win.cc', 'browser/ui/views/app_list/win/app_list_controller_delegate_win.cc',
...@@ -2725,13 +2725,13 @@ ...@@ -2725,13 +2725,13 @@
'browser/storage_monitor/mtab_watcher_linux.h', 'browser/storage_monitor/mtab_watcher_linux.h',
'browser/storage_monitor/storage_monitor_linux.cc', 'browser/storage_monitor/storage_monitor_linux.cc',
'browser/storage_monitor/storage_monitor_linux.h', 'browser/storage_monitor/storage_monitor_linux.h',
'browser/ui/app_list/app_list_service_linux.cc',
'browser/ui/ash/caps_lock_delegate_views.cc', 'browser/ui/ash/caps_lock_delegate_views.cc',
'browser/ui/ash/chrome_shell_delegate_views.cc', 'browser/ui/ash/chrome_shell_delegate_views.cc',
'browser/ui/ash/session_state_delegate_views.cc', 'browser/ui/ash/session_state_delegate_views.cc',
'browser/ui/screen_capture_notification_ui_stub.cc', 'browser/ui/screen_capture_notification_ui_stub.cc',
'browser/ui/startup/default_browser_prompt.cc', 'browser/ui/startup/default_browser_prompt.cc',
'browser/ui/startup/default_browser_prompt.h', 'browser/ui/startup/default_browser_prompt.h',
'browser/ui/views/app_list/linux/app_list_service_linux.cc',
'browser/ui/views/frame/browser_desktop_root_window_host_x11.cc', '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_root_window_host_x11.h',
'browser/ui/views/frame/desktop_browser_frame_aura.cc', 'browser/ui/views/frame/desktop_browser_frame_aura.cc',
......
...@@ -1412,7 +1412,6 @@ ...@@ -1412,7 +1412,6 @@
'browser/ui/app_list/test/app_list_service_test_api.h', 'browser/ui/app_list/test/app_list_service_test_api.h',
'browser/ui/app_list/test/app_list_service_test_api_ash.cc', 'browser/ui/app_list/test/app_list_service_test_api_ash.cc',
'browser/ui/app_list/test/app_list_service_test_api_ash.h', 'browser/ui/app_list/test/app_list_service_test_api_ash.h',
'browser/ui/app_list/test/app_list_service_test_api_linux.cc',
'browser/ui/app_list/test/app_list_service_test_api_mac.mm', 'browser/ui/app_list/test/app_list_service_test_api_mac.mm',
'browser/ui/ash/accelerator_commands_browsertest.cc', 'browser/ui/ash/accelerator_commands_browsertest.cc',
'browser/ui/ash/caps_lock_delegate_chromeos_browsertest.cc', 'browser/ui/ash/caps_lock_delegate_chromeos_browsertest.cc',
...@@ -1476,6 +1475,7 @@ ...@@ -1476,6 +1475,7 @@
'browser/ui/tab_modal_confirm_dialog_browsertest.h', 'browser/ui/tab_modal_confirm_dialog_browsertest.h',
'browser/ui/toolbar/test_toolbar_model.cc', 'browser/ui/toolbar/test_toolbar_model.cc',
'browser/ui/toolbar/test_toolbar_model.h', 'browser/ui/toolbar/test_toolbar_model.h',
'browser/ui/views/app_list/linux/test/app_list_service_test_api_linux.cc',
'browser/ui/views/app_list/win/test/app_list_service_test_api_win.cc', 'browser/ui/views/app_list/win/test/app_list_service_test_api_win.cc',
'browser/ui/views/avatar_menu_button_browsertest.cc', 'browser/ui/views/avatar_menu_button_browsertest.cc',
'browser/ui/views/browser_actions_container_browsertest.cc', 'browser/ui/views/browser_actions_container_browsertest.cc',
...@@ -1763,9 +1763,9 @@ ...@@ -1763,9 +1763,9 @@
'browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc', 'browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc',
'browser/service_process/service_process_control_browsertest.cc', 'browser/service_process/service_process_control_browsertest.cc',
'browser/signin/signin_browsertest.cc', 'browser/signin/signin_browsertest.cc',
'browser/ui/app_list/test/app_list_service_test_api_linux.cc',
# chromeos does not use cross-platform panels # chromeos does not use cross-platform panels
'browser/ui/panels/panel_extension_browsertest.cc', 'browser/ui/panels/panel_extension_browsertest.cc',
'browser/ui/views/app_list/linux/test/app_list_service_test_api_linux.cc',
# chromeos does not use the desktop user manager # chromeos does not use the desktop user manager
'browser/ui/webui/signin/user_manager_ui_browsertest.cc', 'browser/ui/webui/signin/user_manager_ui_browsertest.cc',
], ],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment