diff options
| author | dtapuska <dtapuska@chromium.org> | 2014-12-22 06:36:35 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-22 14:37:13 +0000 |
| commit | ccfd55115d9642d55e5346ae337bcb92f5f913a6 (patch) | |
| tree | b6d1371cc9ec830a616c7307128391214971369c /mojo | |
| parent | 71e305ee3059cd9caf90e92fe68b990bf93d9e52 (diff) | |
| download | chromium_src-ccfd55115d9642d55e5346ae337bcb92f5f913a6.zip chromium_src-ccfd55115d9642d55e5346ae337bcb92f5f913a6.tar.gz chromium_src-ccfd55115d9642d55e5346ae337bcb92f5f913a6.tar.bz2 | |
mojo HTMLViewer crash
The viewer would crash because MojoMain was moved into a html_viewer
namespace. The MojoMain should remain in the default namespace.
BUG=444099
Review URL: https://codereview.chromium.org/816463005
Cr-Commit-Position: refs/heads/master@{#309423}
Diffstat (limited to 'mojo')
| -rw-r--r-- | mojo/services/html_viewer/html_viewer.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mojo/services/html_viewer/html_viewer.cc b/mojo/services/html_viewer/html_viewer.cc index 564564b..fc69d33 100644 --- a/mojo/services/html_viewer/html_viewer.cc +++ b/mojo/services/html_viewer/html_viewer.cc @@ -200,9 +200,9 @@ class HTMLViewer : public mojo::ApplicationDelegate, DISALLOW_COPY_AND_ASSIGN(HTMLViewer); }; +} // namespace html_viewer + MojoResult MojoMain(MojoHandle shell_handle) { - mojo::ApplicationRunnerChromium runner(new HTMLViewer); + mojo::ApplicationRunnerChromium runner(new html_viewer::HTMLViewer); return runner.Run(shell_handle); } - -} // namespace html_viewer |