diff options
| author | sky <sky@chromium.org> | 2015-08-05 14:29:34 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-05 21:30:16 +0000 |
| commit | a11b4d76a27816fe025af647825becac5f633c34 (patch) | |
| tree | 0be98a2476a87d90c23e172660d4e2d14f1dd1fd /components/message_port | |
| parent | 3e4aaaa45c528d4ab0670331a6c0ebfc4f3ab8e6 (diff) | |
| download | chromium_src-a11b4d76a27816fe025af647825becac5f633c34.zip chromium_src-a11b4d76a27816fe025af647825becac5f633c34.tar.gz chromium_src-a11b4d76a27816fe025af647825becac5f633c34.tar.bz2 | |
Straightens outs DEPS in mojo/common
Prior to this change //mojo/environment depended upon //mojo/common. //mojo/common's deps are wrong and it needs to be depend upon various things in //third_party/mojo/src/mojo... When these DEPS are added link errors result because Environment and and a couple of other things need to be defined. These are defined in //mojo/environment. But //mojo/environment can't be a dep of //mojo/common, else we get a cycle.
To straighten this out I've moved the files //mojo/environment needs from //mojo/common to //mojo/message_pump. //mojo/environment no longer depends upon //mojo/common, only //mojo/message_pump. //mojo/common can then depend upon //mojo/environment and we no longer have the cycle. Yay!
BUG=none
TEST=none
Review URL: https://codereview.chromium.org/1262173005
Cr-Commit-Position: refs/heads/master@{#341979}
Diffstat (limited to 'components/message_port')
| -rw-r--r-- | components/message_port/BUILD.gn | 2 | ||||
| -rw-r--r-- | components/message_port/DEPS | 2 | ||||
| -rw-r--r-- | components/message_port/web_message_port_channel_impl.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/components/message_port/BUILD.gn b/components/message_port/BUILD.gn index 3a81750..63c7da1 100644 --- a/components/message_port/BUILD.gn +++ b/components/message_port/BUILD.gn @@ -10,7 +10,7 @@ source_set("message_port") { public_deps = [ "//base", - "//mojo/common", + "//mojo/message_pump", "//third_party/WebKit/public:blink", "//third_party/mojo/src/mojo/public/cpp/system", ] diff --git a/components/message_port/DEPS b/components/message_port/DEPS index eba876f..4f27eb3 100644 --- a/components/message_port/DEPS +++ b/components/message_port/DEPS @@ -1,6 +1,6 @@ include_rules = [ "+base", - "+mojo/common", + "+mojo/message_pump", "+third_party/WebKit/public", "+third_party/mojo/src/mojo/public/cpp/system", ] diff --git a/components/message_port/web_message_port_channel_impl.h b/components/message_port/web_message_port_channel_impl.h index 49fe97e..12d6c28 100644 --- a/components/message_port/web_message_port_channel_impl.h +++ b/components/message_port/web_message_port_channel_impl.h @@ -6,7 +6,7 @@ #define COMPONENTS_MESSAGE_PORT_WEB_MESSAGE_PORT_CHANNEL_IMPL_H_ #include "base/basictypes.h" -#include "mojo/common/handle_watcher.h" +#include "mojo/message_pump/handle_watcher.h" #include "third_party/WebKit/public/platform/WebMessagePortChannel.h" #include "third_party/mojo/src/mojo/public/cpp/system/message_pipe.h" |