Commit 20f9f161 authored by tfarina@chromium.org's avatar tfarina@chromium.org

app_list: Fix include paths to point to ui/ash/app_list instead of ui/views/ash/app_list.

BUG=125846
TBR=ben@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10828170

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150055 0039d316-1c4b-4281-b951-d872f2087c98
parent 0a3e3c61
...@@ -2,11 +2,6 @@ include_rules = [ ...@@ -2,11 +2,6 @@ include_rules = [
"-chrome/browser/ui/views", "-chrome/browser/ui/views",
# TODO(tfarina): Remove all these. crbug.com/125846. # TODO(tfarina): Remove all these. crbug.com/125846.
# DO NOT ADD ANY MORE ITEMS TO THE LIST BELOW! # DO NOT ADD ANY MORE ITEMS TO THE LIST BELOW!
"!chrome/browser/ui/views/ash/app_list/app_list_view_delegate.h",
"!chrome/browser/ui/views/ash/app_list/apps_model_builder.h",
"!chrome/browser/ui/views/ash/app_list/chrome_app_list_item.h",
"!chrome/browser/ui/views/ash/app_list/extension_app_item.h",
"!chrome/browser/ui/views/ash/app_list/search_builder.h",
"!chrome/browser/ui/views/ash/chrome_shell_delegate.h", "!chrome/browser/ui/views/ash/chrome_shell_delegate.h",
"!chrome/browser/ui/views/ash/extension_utils.h", "!chrome/browser/ui/views/ash/extension_utils.h",
"!chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h", "!chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h",
......
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
// 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/views/ash/app_list/app_list_view_delegate.h" #include "chrome/browser/ui/ash/app_list/app_list_view_delegate.h"
#include "ash/shell.h" #include "ash/shell.h"
#include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/views/ash/app_list/apps_model_builder.h" #include "chrome/browser/ui/ash/app_list/apps_model_builder.h"
#include "chrome/browser/ui/views/ash/app_list/chrome_app_list_item.h" #include "chrome/browser/ui/ash/app_list/chrome_app_list_item.h"
#include "chrome/browser/ui/views/ash/app_list/search_builder.h" #include "chrome/browser/ui/ash/app_list/search_builder.h"
AppListViewDelegate::AppListViewDelegate() { AppListViewDelegate::AppListViewDelegate() {
} }
......
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
// 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/views/ash/app_list/apps_model_builder.h" #include "chrome/browser/ui/ash/app_list/apps_model_builder.h"
#include "base/i18n/case_conversion.h" #include "base/i18n/case_conversion.h"
#include "base/utf_string_conversions.h" #include "base/utf_string_conversions.h"
#include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process.h"
#include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/views/ash/app_list/extension_app_item.h" #include "chrome/browser/ui/ash/app_list/extension_app_item.h"
#include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_notification_types.h"
#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension.h"
#include "content/public/browser/notification_service.h" #include "content/public/browser/notification_service.h"
......
...@@ -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/views/ash/app_list/apps_model_builder.h" #include "chrome/browser/ui/ash/app_list/apps_model_builder.h"
#include <string> #include <string>
......
...@@ -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/views/ash/app_list/extension_app_item.h" #include "chrome/browser/ui/ash/app_list/extension_app_item.h"
#include "base/utf_string_conversions.h" #include "base/utf_string_conversions.h"
#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_prefs.h"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_ptr.h"
#include "chrome/browser/extensions/image_loading_tracker.h" #include "chrome/browser/extensions/image_loading_tracker.h"
#include "chrome/browser/ui/views/ash/app_list/chrome_app_list_item.h" #include "chrome/browser/ui/ash/app_list/chrome_app_list_item.h"
#include "ui/base/models/simple_menu_model.h" #include "ui/base/models/simple_menu_model.h"
class ExtensionResource; class ExtensionResource;
......
...@@ -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/views/ash/app_list/search_builder.h" #include "chrome/browser/ui/ash/app_list/search_builder.h"
#include <string> #include <string>
......
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