| Index: shell/dynamic_application_loader.cc
|
| diff --git a/mojo/shell/dynamic_application_loader.cc b/shell/dynamic_application_loader.cc
|
| similarity index 98%
|
| rename from mojo/shell/dynamic_application_loader.cc
|
| rename to shell/dynamic_application_loader.cc
|
| index 1d33a5c8532d9685dca66e47bfdac247a96ed8c8..e8a4fb2d08ffb9a18d27554f13eacc7a08849d07 100644
|
| --- a/mojo/shell/dynamic_application_loader.cc
|
| +++ b/shell/dynamic_application_loader.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "mojo/shell/dynamic_application_loader.h"
|
| +#include "shell/dynamic_application_loader.h"
|
|
|
| #include "base/bind.h"
|
| #include "base/command_line.h"
|
| @@ -20,10 +20,10 @@
|
| #include "mojo/common/data_pipe_utils.h"
|
| #include "mojo/public/cpp/system/data_pipe.h"
|
| #include "mojo/services/public/interfaces/network/url_loader.mojom.h"
|
| -#include "mojo/shell/context.h"
|
| -#include "mojo/shell/data_pipe_peek.h"
|
| -#include "mojo/shell/filename_util.h"
|
| -#include "mojo/shell/switches.h"
|
| +#include "shell/context.h"
|
| +#include "shell/data_pipe_peek.h"
|
| +#include "shell/filename_util.h"
|
| +#include "shell/switches.h"
|
| #include "url/url_util.h"
|
|
|
| namespace mojo {
|
| @@ -366,7 +366,7 @@ void DynamicApplicationLoader::RegisterContentHandler(
|
| const std::string& mime_type,
|
| const GURL& content_handler_url) {
|
| DCHECK(content_handler_url.is_valid())
|
| - << "Content handler URL is invalid for mime type " << mime_type;
|
| + << "Content handler URL is invalid for mime type " << mime_type;
|
| mime_type_to_url_[mime_type] = content_handler_url;
|
| }
|
|
|
|
|