summaryrefslogtreecommitdiffstats
path: root/mojo/system/dispatcher.h
diff options
context:
space:
mode:
authorfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-14 20:51:14 +0000
committerfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-14 20:51:14 +0000
commit0fb4abfcaea7a139f2429b09aa5fcb114a65d33a (patch)
tree4bc749493217cc399356e4e5855082572033afdc /mojo/system/dispatcher.h
parent539c1022ad2837b2171d510252afa575f89d9dcb (diff)
downloadchromium_src-0fb4abfcaea7a139f2429b09aa5fcb114a65d33a.zip
chromium_src-0fb4abfcaea7a139f2429b09aa5fcb114a65d33a.tar.gz
chromium_src-0fb4abfcaea7a139f2429b09aa5fcb114a65d33a.tar.bz2
Revert 263717 "Make mojo_system static and mojo_system_impl a co..."
Reason for revert: broke Win x64 Builder: http://build.chromium.org/p/chromium.win/builders/Win%20x64%20Builder/builds/17235/ > Make mojo_system static and mojo_system_impl a component, never use both > > BUG= > R=viettrungluu@chromium.org > > Review URL: https://codereview.chromium.org/231353002 TBR=davemoore@chromium.org Review URL: https://codereview.chromium.org/237703002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263722 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/system/dispatcher.h')
-rw-r--r--mojo/system/dispatcher.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/mojo/system/dispatcher.h b/mojo/system/dispatcher.h
index 504e33a..5bb6b3e 100644
--- a/mojo/system/dispatcher.h
+++ b/mojo/system/dispatcher.h
@@ -22,7 +22,7 @@ namespace mojo {
namespace system {
class Channel;
-class Core;
+class CoreImpl;
class Dispatcher;
class DispatcherTransport;
class HandleTable;
@@ -135,9 +135,9 @@ class MOJO_SYSTEM_IMPL_EXPORT Dispatcher :
// has been called.
class HandleTableAccess {
private:
- friend class Core;
+ friend class CoreImpl;
friend class HandleTable;
- // Tests also need this, to avoid needing |Core|.
+ // Tests also need this, to avoid needing |CoreImpl|.
friend DispatcherTransport test::DispatcherTryStartTransport(Dispatcher*);
// This must be called under the handle table lock and only if the handle