summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorraymes <raymes@chromium.org>2016-01-19 19:01:01 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-20 03:02:21 +0000
commit15d94b7c0e0b17e973d144c03c7f69f9e0f62309 (patch)
tree7199096ec9c9be35643f2985c7f49e45659618e1 /chrome
parentcaf664a996be25ec5f567f183dd897de4abff952 (diff)
downloadchromium_src-15d94b7c0e0b17e973d144c03c7f69f9e0f62309.zip
chromium_src-15d94b7c0e0b17e973d144c03c7f69f9e0f62309.tar.gz
chromium_src-15d94b7c0e0b17e973d144c03c7f69f9e0f62309.tar.bz2
Revert of Host-side implementation of ARC Intent handler (patchset #5 id:80001 of https://codereview.chromium.org/1590723003/ )
Reason for revert: This may have broken the ChromeOS trybots: https://build.chromium.org/p/tryserver.chromium.linux/builders/chromeos_amd64-generic_chromium_compile_only_ng/builds/81609/steps/compile%20%28with%20patch%29/logs/stdio ../../chrome/browser/chromeos/arc/arc_intent_helper_bridge_impl.cc: In member function 'virtual void arc::ArcIntentHelperBridgeImpl::OnOpenUrl(const mojo::String&)': ../../chrome/browser/chromeos/arc/arc_intent_helper_bridge_impl.cc:39:16: error: no matching function for call to 'GURL::GURL(const mojo::String&)' GURL gurl(url); Original issue's description: > Host-side implementation of ARC Intent handler > > The new interface, OnOpenUrl(), is implemented in > arc_intent_helper_bridge_impl.cc. ARC-side CLs for > the interfacve are ag/845051/ and ag/845044/. > > BUG=577929 > TEST=http, https, and mailto URLs are passed from ARC > > Committed: https://crrev.com/379e0814ff680203c0b4d88cc77d339f0d03f70f > Cr-Commit-Position: refs/heads/master@{#370240} TBR=dcheng@chromium.org,hidehiko@chromium.org,lhchavez@chromium.org,xiyuan@chromium.org,yusukes@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=577929 Review URL: https://codereview.chromium.org/1607603005 Cr-Commit-Position: refs/heads/master@{#370289}
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/chromeos/arc/arc_intent_helper_bridge_impl.cc54
-rw-r--r--chrome/browser/chromeos/arc/arc_intent_helper_bridge_impl.h41
-rw-r--r--chrome/browser/chromeos/chrome_browser_main_chromeos.cc2
-rw-r--r--chrome/chrome_browser_chromeos.gypi2
4 files changed, 0 insertions, 99 deletions
diff --git a/chrome/browser/chromeos/arc/arc_intent_helper_bridge_impl.cc b/chrome/browser/chromeos/arc/arc_intent_helper_bridge_impl.cc
deleted file mode 100644
index 86d84b5..0000000
--- a/chrome/browser/chromeos/arc/arc_intent_helper_bridge_impl.cc
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/chromeos/arc/arc_intent_helper_bridge_impl.h"
-
-#include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
-#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_tabstrip.h"
-#include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
-#include "components/arc/common/intent_helper.mojom.h"
-
-namespace arc {
-
-ArcIntentHelperBridgeImpl::ArcIntentHelperBridgeImpl() : binding_(this) {}
-
-ArcIntentHelperBridgeImpl::~ArcIntentHelperBridgeImpl() {
- ArcBridgeService* bridge_service = ArcBridgeService::Get();
- DCHECK(bridge_service);
- bridge_service->RemoveObserver(this);
-}
-
-void ArcIntentHelperBridgeImpl::StartObservingBridgeServiceChanges() {
- ArcBridgeService* bridge_service = ArcBridgeService::Get();
- DCHECK(bridge_service);
- bridge_service->AddObserver(this);
-}
-
-void ArcIntentHelperBridgeImpl::OnIntentHelperInstanceReady() {
- IntentHelperHostPtr host;
- binding_.Bind(mojo::GetProxy(&host));
- ArcBridgeService* bridge_service = ArcBridgeService::Get();
- bridge_service->intent_helper_instance()->Init(std::move(host));
-}
-
-void ArcIntentHelperBridgeImpl::OnOpenUrl(const mojo::String& url) {
- GURL gurl(url);
- if (!gurl.is_valid())
- return;
-
- chrome::ScopedTabbedBrowserDisplayer displayer(
- ProfileManager::GetActiveUserProfile(), chrome::HOST_DESKTOP_TYPE_ASH);
- chrome::AddSelectedTabWithURL(displayer.browser(), gurl,
- ui::PAGE_TRANSITION_LINK);
-
- // Since the ScopedTabbedBrowserDisplayer does not guarantee that the
- // browser will be shown on the active desktop, we ensure the visibility.
- multi_user_util::MoveWindowToCurrentDesktop(
- displayer.browser()->window()->GetNativeWindow());
-}
-
-} // namespace arc
diff --git a/chrome/browser/chromeos/arc/arc_intent_helper_bridge_impl.h b/chrome/browser/chromeos/arc/arc_intent_helper_bridge_impl.h
deleted file mode 100644
index 5af1f44..0000000
--- a/chrome/browser/chromeos/arc/arc_intent_helper_bridge_impl.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_ARC_ARC_INTENT_HELPER_BRIDGE_IMPL_H_
-#define CHROME_BROWSER_CHROMEOS_ARC_ARC_INTENT_HELPER_BRIDGE_IMPL_H_
-
-#include "base/macros.h"
-#include "components/arc/arc_bridge_service.h"
-#include "components/arc/common/intent_helper.mojom.h"
-#include "components/arc/intent_helper/arc_intent_helper_bridge.h"
-#include "mojo/public/cpp/bindings/binding.h"
-
-namespace arc {
-
-// Receives intents from ARC.
-class ArcIntentHelperBridgeImpl : public ArcIntentHelperBridge,
- public ArcBridgeService::Observer,
- public IntentHelperHost {
- public:
- ArcIntentHelperBridgeImpl();
- ~ArcIntentHelperBridgeImpl() override;
-
- // Starts listening to state changes of the ArcBridgeService.
- // This must be called before the bridge service starts bootstrapping.
- void StartObservingBridgeServiceChanges() override;
-
- // ArcBridgeService::Observer
- void OnIntentHelperInstanceReady() override;
-
- // arc::IntentHelperHost
- void OnOpenUrl(const mojo::String& url) override;
-
- private:
- mojo::Binding<IntentHelperHost> binding_;
-
- DISALLOW_COPY_AND_ASSIGN(ArcIntentHelperBridgeImpl);
-};
-
-} // namespace arc
-
-#endif // CHROME_BROWSER_CHROMEOS_ARC_ARC_INTENT_HELPER_BRIDGE_IMPL_H_
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 23a96a3..aa3df36 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -34,7 +34,6 @@
#include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
#include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h"
#include "chrome/browser/chromeos/arc/arc_auth_service_impl.h"
-#include "chrome/browser/chromeos/arc/arc_intent_helper_bridge_impl.h"
#include "chrome/browser/chromeos/arc/arc_settings_bridge_impl.h"
#include "chrome/browser/chromeos/boot_times_recorder.h"
#include "chrome/browser/chromeos/dbus/chrome_console_service_provider_delegate.h"
@@ -401,7 +400,6 @@ void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() {
arc_service_manager_.reset(new arc::ArcServiceManager(
make_scoped_ptr(new arc::ArcAuthServiceImpl()),
- make_scoped_ptr(new arc::ArcIntentHelperBridgeImpl()),
make_scoped_ptr(new arc::ArcSettingsBridgeImpl()),
make_scoped_ptr(
new arc::ArcVideoBridge(content::CreateArcVideoHostDelegate()))));
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index f7929de..5033f54 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -54,8 +54,6 @@
'browser/chromeos/app_mode/startup_app_launcher.h',
'browser/chromeos/arc/arc_auth_service_impl.cc',
'browser/chromeos/arc/arc_auth_service_impl.h',
- 'browser/chromeos/arc/arc_intent_helper_bridge_impl.cc',
- 'browser/chromeos/arc/arc_intent_helper_bridge_impl.h',
'browser/chromeos/arc/arc_settings_bridge_impl.cc',
'browser/chromeos/arc/arc_settings_bridge_impl.h',
'browser/chromeos/attestation/attestation_ca_client.cc',