diff options
| author | ben <ben@chromium.org> | 2015-08-20 19:37:34 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-21 02:38:50 +0000 |
| commit | 243570668eb88df434414fd0d617ffd40cbac178 (patch) | |
| tree | 8772672c47d306ca9f3c73be467758611abb0298 /mandoline/services | |
| parent | 86fd9d20060aa3615f348637ec43c1bc8aa60394 (diff) | |
| download | chromium_src-243570668eb88df434414fd0d617ffd40cbac178.zip chromium_src-243570668eb88df434414fd0d617ffd40cbac178.tar.gz chromium_src-243570668eb88df434414fd0d617ffd40cbac178.tar.bz2 | |
Merge Browser and DesktopUI.
- Eliminates AndroidUI.
- Eliminates Browser, folding into DesktopUI.
Subsequent steps will be to shift this class up one level & rename to something better.
R=sky@chromium.org
BUG=none
Review URL: https://codereview.chromium.org/1308553003
Cr-Commit-Position: refs/heads/master@{#344662}
Diffstat (limited to 'mandoline/services')
3 files changed, 8 insertions, 7 deletions
diff --git a/mandoline/services/core_services/BUILD.gn b/mandoline/services/core_services/BUILD.gn index eea2e2c..27c218e 100644 --- a/mandoline/services/core_services/BUILD.gn +++ b/mandoline/services/core_services/BUILD.gn @@ -47,7 +47,6 @@ source_set("sources") { "//components/clipboard:lib", "//components/filesystem:lib", "//mandoline/tab:lib", - "//mandoline/ui/browser:lib", "//mojo/application/public/cpp", "//mojo/common:tracing_impl", "//mojo/message_pump", @@ -75,6 +74,7 @@ source_set("sources") { if (use_aura) { deps += [ "//components/view_manager/public/cpp", + "//mandoline/ui/browser:lib", "//mandoline/ui/omnibox:lib", ] sources += [ "application_delegate_factory_aura.cc" ] diff --git a/mandoline/services/core_services/application_delegate_factory_aura.cc b/mandoline/services/core_services/application_delegate_factory_aura.cc index 1b3f4c1..d02d534 100644 --- a/mandoline/services/core_services/application_delegate_factory_aura.cc +++ b/mandoline/services/core_services/application_delegate_factory_aura.cc @@ -4,14 +4,18 @@ #include "mandoline/services/core_services/application_delegate_factory.h" +#include "mandoline/ui/browser/browser_manager.h" #include "mandoline/ui/omnibox/omnibox_impl.h" namespace core_services { scoped_ptr<mojo::ApplicationDelegate> CreateApplicationDelegateAura( const std::string& url) { - return url == "mojo://omnibox/" ? make_scoped_ptr(new mandoline::OmniboxImpl) - : nullptr; + if (url == "mojo://browser/") + return make_scoped_ptr(new mandoline::BrowserManager); + else if (url == "mojo://omnibox/") + return make_scoped_ptr(new mandoline::OmniboxImpl); + return nullptr; } } // namespace core_services diff --git a/mandoline/services/core_services/core_services_application_delegate.cc b/mandoline/services/core_services/core_services_application_delegate.cc index 7cb68de..8595a26 100644 --- a/mandoline/services/core_services/core_services_application_delegate.cc +++ b/mandoline/services/core_services/core_services_application_delegate.cc @@ -11,7 +11,6 @@ #include "components/filesystem/file_system_app.h" #include "mandoline/services/core_services/application_delegate_factory.h" #include "mandoline/tab/web_view_application_delegate.h" -#include "mandoline/ui/browser/browser_manager.h" #include "mojo/application/public/cpp/application_connection.h" #include "mojo/application/public/cpp/application_impl.h" #include "mojo/application/public/cpp/application_runner.h" @@ -115,9 +114,7 @@ void CoreServicesApplicationDelegate::StartApplication( const std::string url = response->url; scoped_ptr<mojo::ApplicationDelegate> delegate; - if (url == "mojo://browser/") { - delegate.reset(new mandoline::BrowserManager); - } else if (url == "mojo://clipboard/") { + if (url == "mojo://clipboard/") { delegate.reset(new clipboard::ClipboardApplicationDelegate); } else if (url == "mojo://filesystem/") { delegate.reset(new filesystem::FileSystemApp); |