diff options
| author | yzshen <yzshen@chromium.org> | 2015-11-24 21:58:10 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-25 05:59:12 +0000 |
| commit | 0b5628a30a249184528900b0d3f3eb81a83f8c39 (patch) | |
| tree | a7cfac1e01784e8f29b619f62d550601b271eaac /components | |
| parent | 8b8dcd27413abeaa08b9fcb481a30c25a059d97d (diff) | |
| download | chromium_src-0b5628a30a249184528900b0d3f3eb81a83f8c39.zip chromium_src-0b5628a30a249184528900b0d3f3eb81a83f8c39.tar.gz chromium_src-0b5628a30a249184528900b0d3f3eb81a83f8c39.tar.bz2 | |
Mojo C++ bindings: InterfacePtr<T> and Binding<T> use MultiplexRouter when T passes associated interface pointers/requests.
BUG=546067
Review URL: https://codereview.chromium.org/1473273003
Cr-Commit-Position: refs/heads/master@{#361590}
Diffstat (limited to 'components')
| -rw-r--r-- | components/html_viewer/global_state.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/html_viewer/global_state.cc b/components/html_viewer/global_state.cc index dea9891..4bbf4db 100644 --- a/components/html_viewer/global_state.cc +++ b/components/html_viewer/global_state.cc @@ -155,7 +155,7 @@ void GlobalState::InitIfNecessary(const gfx::Size& screen_size_in_pixels, pak_file_2.Pass(), base::MemoryMappedFile::Region::kWholeFile); } - mojo::logging::InitLogging(); + mojo::InitLogging(); if (command_line->HasSwitch(kDisableEncryptedMedia)) blink::WebRuntimeFeatures::enableEncryptedMedia(false); |