Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(206)

Issue 2799963004: Revert of Create org.chromium.KioskAppService. (Closed)

Created:
3 years, 8 months ago by teravest
Modified:
3 years, 8 months ago
Reviewers:
James Cook, Daniel Erat
CC:
chromium-reviews, hashimoto+watch_chromium.org, oshima+watch_chromium.org, davemoore+watch_chromium.org, ios-reviews_chromium.org
Target Ref:
refs/heads/master
Project:
chromium
Visibility:
Public.

Description

Revert of Create org.chromium.KioskAppService. (patchset #5 id:80001 of https://codereview.chromium.org/2798703002/ ) Reason for revert: Appears to have broken the simplechrome workflow, maybe all of the dependent changes aren't in yet? Original issue's description: > Create org.chromium.KioskAppService. > > This creates a D-Bus service that extracts a "Kiosk app" related method > from LibCrosService. Clients have to be migrated to this before the > corresponding method may be removed from LibCrosService. > > BUG=703229 > TEST=deploy_chrome, manually sent a message to new method, got response. > > Review-Url: https://codereview.chromium.org/2798703002 > Cr-Commit-Position: refs/heads/master@{#462653} > Committed: https://chromium.googlesource.com/chromium/src/+/6e2e787479f591d24386ba91d8bbf3d1cfbe1fd3 TBR=derat@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=703229

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+4 lines, -61 lines) Patch
M chrome/browser/chromeos/chrome_browser_main_chromeos.cc View 3 chunks +1 line, -13 lines 0 comments Download
M chrome/browser/chromeos/dbus/kiosk_info_service_provider.h View 2 chunks +1 line, -7 lines 0 comments Download
M chrome/browser/chromeos/dbus/kiosk_info_service_provider.cc View 1 chunk +2 lines, -6 lines 0 comments Download
M chromeos/BUILD.gn View 1 chunk +0 lines, -1 line 0 comments Download
M chromeos/dbus/services/cros_dbus_service.h View 1 chunk +0 lines, -4 lines 0 comments Download
M chromeos/dbus/services/cros_dbus_service.cc View 1 chunk +0 lines, -8 lines 0 comments Download
D chromeos/dbus/services/org.chromium.KioskAppService.conf View 1 chunk +0 lines, -22 lines 0 comments Download

Messages

Total messages: 7 (3 generated)
teravest
Created Revert of Create org.chromium.KioskAppService.
3 years, 8 months ago (2017-04-07 17:00:45 UTC) #2
James Cook
lgtm
3 years, 8 months ago (2017-04-07 17:01:09 UTC) #4
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2799963004/1
3 years, 8 months ago (2017-04-07 17:01:19 UTC) #5
commit-bot: I haz the power
3 years, 8 months ago (2017-04-07 17:04:05 UTC) #7
Failed to apply patch for
chrome/browser/chromeos/chrome_browser_main_chromeos.cc:
While running git apply --index -3 -p1;
  error: patch failed:
chrome/browser/chromeos/chrome_browser_main_chromeos.cc:248
  error: repository lacks the necessary blob to fall back on 3-way merge.
  error: chrome/browser/chromeos/chrome_browser_main_chromeos.cc: patch does not
apply

Patch:       chrome/browser/chromeos/chrome_browser_main_chromeos.cc
Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index
adee07314adbe50a855f2f31169e9c63b64bf94b..78643442b9f306694e2c3a90a533c4278c61b9f9
100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -248,19 +248,10 @@
       service_providers.push_back(base::MakeUnique<ConsoleServiceProvider>(
           base::MakeUnique<ChromeConsoleServiceProviderDelegate>()));
     }
-    service_providers.push_back(base::MakeUnique<KioskInfoService>(
-        kLibCrosServiceInterface,
-        kKioskAppServiceGetRequiredPlatformVersionMethod));
+    service_providers.push_back(base::MakeUnique<KioskInfoService>());
     cros_dbus_service_ = CrosDBusService::Create(
         kLibCrosServiceName, dbus::ObjectPath(kLibCrosServicePath),
         std::move(service_providers));
-
-    kiosk_info_service_ = CrosDBusService::Create(
-        kKioskAppServiceName, dbus::ObjectPath(kKioskAppServicePath),
-        CrosDBusService::CreateServiceProviderList(
-            base::MakeUnique<KioskInfoService>(
-                kKioskAppServiceInterface,
-                kKioskAppServiceGetRequiredPlatformVersionMethod)));
 
     // Initialize PowerDataCollector after DBusThreadManager is initialized.
     PowerDataCollector::Initialize();
@@ -311,7 +302,6 @@
     CertLoader::Shutdown();
     TPMTokenLoader::Shutdown();
     cros_dbus_service_.reset();
-    kiosk_info_service_.reset();
     PowerDataCollector::Shutdown();
     PowerPolicyController::Shutdown();
     device::BluetoothAdapterFactory::Shutdown();
@@ -328,8 +318,6 @@
   // TODO(derat): Move these providers into more-specific services that are
   // split between different processes: http://crbug.com/692246
   std::unique_ptr<CrosDBusService> cros_dbus_service_;
-
-  std::unique_ptr<CrosDBusService> kiosk_info_service_;
 
   std::unique_ptr<NetworkConnectDelegateChromeOS> network_connect_delegate_;

Powered by Google App Engine
This is Rietveld 408576698