diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-14 14:21:38 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-14 14:21:38 +0000 |
| commit | 92295fe46f75f4f1fa9fc679ac22c4141a8f371b (patch) | |
| tree | d3a219422639e18e107bc6f17cb222325ec09ad5 | |
| parent | 9cdd71579d57869f215155a772aa5f15c27df48c (diff) | |
| download | chromium_src-92295fe46f75f4f1fa9fc679ac22c4141a8f371b.zip chromium_src-92295fe46f75f4f1fa9fc679ac22c4141a8f371b.tar.gz chromium_src-92295fe46f75f4f1fa9fc679ac22c4141a8f371b.tar.bz2 | |
Lock down DEPS a bit more.
As part of my effort to split ash into targets with and without content, I'm locking down the DEPS files very tightly to make using content from anywhere in ash harder. There are some carve-outs for specific subsections that need to use it (e.g. Desktop Background, Screensaver, etc.) and these are exempted in DEPS files. There are a few #includes I can't get rid of just yet in Shell, testing stuff etc, but I've exempted those explicitly for the time being.
R=oshima@chromium.org
http://crbug.com/332504
Review URL: https://codereview.chromium.org/131223007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244698 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ash/DEPS | 4 | ||||
| -rw-r--r-- | ash/desktop_background/DEPS | 3 | ||||
| -rw-r--r-- | ash/keyboard_overlay/DEPS | 3 | ||||
| -rw-r--r-- | ash/shell.cc | 1 | ||||
| -rw-r--r-- | ash/system/chromeos/keyboard_brightness_controller.cc | 1 | ||||
| -rw-r--r-- | ash/test/DEPS | 4 | ||||
| -rw-r--r-- | ash/wm/lock_state_controller.cc | 1 |
7 files changed, 12 insertions, 5 deletions
@@ -1,7 +1,6 @@ include_rules = [ "+cc/debug", "+chromeos", - "+content/public", "+gpu/config", "+grit/ash_resources.h", "+grit/ash_strings.h", @@ -14,4 +13,7 @@ include_rules = [ "+net", "+ui", "+win8", + + # Used by shell.cc, accelerator_controller.cc, tray_monitor.h + "+content/public/browser/gpu_data_manager.h", ] diff --git a/ash/desktop_background/DEPS b/ash/desktop_background/DEPS new file mode 100644 index 0000000..fe7bb13 --- /dev/null +++ b/ash/desktop_background/DEPS @@ -0,0 +1,3 @@ +include_rules = [ + "+content/public", +] diff --git a/ash/keyboard_overlay/DEPS b/ash/keyboard_overlay/DEPS new file mode 100644 index 0000000..fe7bb13 --- /dev/null +++ b/ash/keyboard_overlay/DEPS @@ -0,0 +1,3 @@ +include_rules = [ + "+content/public", +] diff --git a/ash/shell.cc b/ash/shell.cc index 0816320..532da3e 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -83,7 +83,6 @@ #include "base/command_line.h" #include "base/debug/leak_annotations.h" #include "base/debug/trace_event.h" -#include "content/public/browser/user_metrics.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/user_action_client.h" #include "ui/aura/env.h" diff --git a/ash/system/chromeos/keyboard_brightness_controller.cc b/ash/system/chromeos/keyboard_brightness_controller.cc index 15f91ed..7d7efe6 100644 --- a/ash/system/chromeos/keyboard_brightness_controller.cc +++ b/ash/system/chromeos/keyboard_brightness_controller.cc @@ -8,7 +8,6 @@ #include "ash/shell.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/power_manager_client.h" -#include "content/public/browser/user_metrics.h" #include "ui/base/accelerators/accelerator.h" namespace ash { diff --git a/ash/test/DEPS b/ash/test/DEPS index aaa9ae0..e6be49d 100644 --- a/ash/test/DEPS +++ b/ash/test/DEPS @@ -1,4 +1,6 @@ include_rules = [ - "+content/public/test", + "+content/public/test/web_contents_tester.h", + "+content/public/test/test_browser_thread_bundle.h", + "+content/public/test/test_browser_context.h", "+win8/viewer", ] diff --git a/ash/wm/lock_state_controller.cc b/ash/wm/lock_state_controller.cc index be34131..2fc3503 100644 --- a/ash/wm/lock_state_controller.cc +++ b/ash/wm/lock_state_controller.cc @@ -17,7 +17,6 @@ #include "base/bind_helpers.h" #include "base/command_line.h" #include "base/timer/timer.h" -#include "content/public/browser/user_metrics.h" #include "ui/aura/root_window.h" #include "ui/compositor/layer_animation_sequence.h" #include "ui/compositor/scoped_layer_animation_settings.h" |