summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorcalamity@chromium.org <calamity@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-25 06:52:45 +0000
committercalamity@chromium.org <calamity@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-25 06:52:45 +0000
commita9113665b60fb42b777ca3ab8a04a93902fa18a7 (patch)
treef5df70f510b6bf8ef751e2292f08949041925285 /apps
parent98b026a16dd66889e64a0a9f2d8fe2602adaae0c (diff)
downloadchromium_src-a9113665b60fb42b777ca3ab8a04a93902fa18a7.zip
chromium_src-a9113665b60fb42b777ca3ab8a04a93902fa18a7.tar.gz
chromium_src-a9113665b60fb42b777ca3ab8a04a93902fa18a7.tar.bz2
Move app_launcher_utils to chrome/browser/ui/app_list
This CL moves app_launcher_util out of chrome/apps and into chrome/browser/ui/app_list. It also renames the files from app_launcher_util to app_list_util to be more consistent. TBR=sky@chromium.org Review URL: https://codereview.chromium.org/34623014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230970 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps')
-rw-r--r--apps/app_shim/DEPS2
-rw-r--r--apps/app_shim/app_shim_mac.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_shim/DEPS b/apps/app_shim/DEPS
index a0104bb..8d51bf5 100644
--- a/apps/app_shim/DEPS
+++ b/apps/app_shim/DEPS
@@ -1,9 +1,9 @@
include_rules = [
# TODO(benwells): move this whole folder out of apps and review these.
# See http://crbug.com/266705.
- "+chrome/browser/apps/app_launcher_util.h",
"+chrome/browser/browser_process.h",
"+chrome/browser/ui/app_list/app_list_service.h",
+ "+chrome/browser/ui/app_list/app_list_util.h",
"+chrome/browser/ui/extensions/application_launch.h",
"+chrome/browser/ui/web_applications/web_app_ui.h",
"+chrome/browser/ui/webui/ntp/core_app_launcher_handler.h",
diff --git a/apps/app_shim/app_shim_mac.cc b/apps/app_shim/app_shim_mac.cc
index e9eddd7..553f07c 100644
--- a/apps/app_shim/app_shim_mac.cc
+++ b/apps/app_shim/app_shim_mac.cc
@@ -5,7 +5,7 @@
#include "apps/app_shim/app_shim_mac.h"
#include "base/command_line.h"
-#include "chrome/browser/apps/app_launcher_util.h"
+#include "chrome/browser/ui/app_list/app_list_util.h"
#include "chrome/common/chrome_switches.h"
namespace apps {