Show one camera icon at all time. The behavior after clicking the icon is decided by the following decision tree: Is ARC++ enabled? No => Open CCA. Yes => CCA migration done? Yes => GCA No => CCA
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/865282dd9efbff17e8ee80db860e35efc1bfc3ce commit 865282dd9efbff17e8ee80db860e35efc1bfc3ce Author: Sheng-Hao Tsao <shenghao@google.com> Date: Fri Jul 13 18:18:56 2018 Add cameraMediaConsolidated to chromeosInfoPrivate API This CL adds cameraMediaConsolidated as one of the preference key value pairs that can be set through chromeosInfoPrivate API. The preference is useful for determining which camera app (Chrome camera app or Google camera app) to open when users click the camera icon. cameraMediaConsolidated preference Bug: 861952 Test: Chrome extension can call chromeosInfoPrivate.set() to set Change-Id: I8960734d5bb44712a86c7998081c91e750d963cd Reviewed-on: https://chromium-review.googlesource.com/1130543 Commit-Queue: Sheng-hao Tsao <shenghao@google.com> Reviewed-by: Istiaque Ahmed <lazyboy@chromium.org> Reviewed-by: Steven Bennetts <stevenjb@chromium.org> Cr-Commit-Position: refs/heads/master@{#574984} [modify] https://crrev.com/865282dd9efbff17e8ee80db860e35efc1bfc3ce/chrome/browser/chromeos/extensions/info_private_api.cc [modify] https://crrev.com/865282dd9efbff17e8ee80db860e35efc1bfc3ce/chrome/browser/chromeos/extensions/info_private_apitest.cc [modify] https://crrev.com/865282dd9efbff17e8ee80db860e35efc1bfc3ce/chrome/browser/chromeos/preferences.cc [modify] https://crrev.com/865282dd9efbff17e8ee80db860e35efc1bfc3ce/chrome/common/extensions/api/chromeos_info_private.json [modify] https://crrev.com/865282dd9efbff17e8ee80db860e35efc1bfc3ce/chrome/common/pref_names.cc [modify] https://crrev.com/865282dd9efbff17e8ee80db860e35efc1bfc3ce/chrome/common/pref_names.h [modify] https://crrev.com/865282dd9efbff17e8ee80db860e35efc1bfc3ce/chrome/test/data/extensions/api_test/chromeos_info_private/basic/background.js
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/677ac15fe1c26a9301e8355aa29c128d6d1c2b16 commit 677ac15fe1c26a9301e8355aa29c128d6d1c2b16 Author: Sheng-Hao Tsao <shenghao@google.com> Date: Wed Jul 18 02:26:59 2018 Consolidate camera app icons This CL creates a persistent camera icon in launcher. When users click on it, whether to open Chrome camera app or Google camera app is determined dynamically. CCA or GCA based on whether consolidation is done and whether ARC is enabled. Bug: 861952 Test: Tested on eve that there's always one camera icon shown and opens Change-Id: I93835bbae6791a7fc712bea07f3f85b1b83d3185 Reviewed-on: https://chromium-review.googlesource.com/1137054 Commit-Queue: Sheng-hao Tsao <shenghao@google.com> Reviewed-by: Steven Bennetts <stevenjb@chromium.org> Reviewed-by: Mitsuru Oshima <oshima@chromium.org> Cr-Commit-Position: refs/heads/master@{#575910} [modify] https://crrev.com/677ac15fe1c26a9301e8355aa29c128d6d1c2b16/ash/public/cpp/app_list/internal_app_id_constants.h [modify] https://crrev.com/677ac15fe1c26a9301e8355aa29c128d6d1c2b16/ash/public/cpp/resources/ash_public_unscaled_resources.grd [add] https://crrev.com/677ac15fe1c26a9301e8355aa29c128d6d1c2b16/ash/public/cpp/resources/unscaled_resources/camera_logo_192.png [modify] https://crrev.com/677ac15fe1c26a9301e8355aa29c128d6d1c2b16/chrome/app/chromeos_strings.grdp [modify] https://crrev.com/677ac15fe1c26a9301e8355aa29c128d6d1c2b16/chrome/browser/ui/BUILD.gn [modify] https://crrev.com/677ac15fe1c26a9301e8355aa29c128d6d1c2b16/chrome/browser/ui/app_list/arc/arc_app_utils.cc [modify] https://crrev.com/677ac15fe1c26a9301e8355aa29c128d6d1c2b16/chrome/browser/ui/app_list/extension_app_model_builder.cc [add] https://crrev.com/677ac15fe1c26a9301e8355aa29c128d6d1c2b16/chrome/browser/ui/app_list/extension_app_utils.cc [add] https://crrev.com/677ac15fe1c26a9301e8355aa29c128d6d1c2b16/chrome/browser/ui/app_list/extension_app_utils.h [modify] https://crrev.com/677ac15fe1c26a9301e8355aa29c128d6d1c2b16/chrome/browser/ui/app_list/internal_app/internal_app_item.cc [modify] https://crrev.com/677ac15fe1c26a9301e8355aa29c128d6d1c2b16/chrome/browser/ui/app_list/internal_app/internal_app_metadata.cc [modify] https://crrev.com/677ac15fe1c26a9301e8355aa29c128d6d1c2b16/chrome/browser/ui/app_list/internal_app/internal_app_metadata.h [modify] https://crrev.com/677ac15fe1c26a9301e8355aa29c128d6d1c2b16/chrome/browser/ui/app_list/search/app_search_provider.cc [modify] https://crrev.com/677ac15fe1c26a9301e8355aa29c128d6d1c2b16/chrome/browser/ui/app_list/search/internal_app_result.cc [modify] https://crrev.com/677ac15fe1c26a9301e8355aa29c128d6d1c2b16/chrome/browser/ui/app_list/search/tests/app_search_provider_unittest.cc [modify] https://crrev.com/677ac15fe1c26a9301e8355aa29c128d6d1c2b16/chrome/browser/ui/ash/launcher/launcher_controller_helper.cc
The following revision refers to this bug: https://chromium.googlesource.com/apps/camera/+/444c96cd564208c6909dfcd9733a2736b1390cea commit 444c96cd564208c6909dfcd9733a2736b1390cea Author: Sheng-Hao Tsao <shenghao@google.com> Date: Thu Aug 09 08:46:34 2018 Notify chromium that migration is done This CL use chromeosInfoPrivate to get/set whether migration is done from/to chromium. BUG=chromium:861952 TEST=Tested on nautilus that after opening CCA once, the migration is completed and the camera icon opens GCA afterwards. Change-Id: I1f28998f91fe11d7bcee01d79552b6756e956344 Reviewed-on: https://chromium-review.googlesource.com/1168720 Reviewed-by: yuli <yuli@chromium.org> Tested-by: Sheng-hao Tsao <shenghao@google.com> [modify] https://crrev.com/444c96cd564208c6909dfcd9733a2736b1390cea/src/js/models/file_system.js
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/444c96cd564208c6909dfcd9733a2736b1390cea commit 444c96cd564208c6909dfcd9733a2736b1390cea Author: Sheng-Hao Tsao <shenghao@google.com> Date: Thu Aug 09 08:46:34 2018 Notify chromium that migration is done This CL use chromeosInfoPrivate to get/set whether migration is done from/to chromium. BUG=chromium:861952 TEST=Tested on nautilus that after opening CCA once, the migration is completed and the camera icon opens GCA afterwards. Change-Id: I1f28998f91fe11d7bcee01d79552b6756e956344 Reviewed-on: https://chromium-review.googlesource.com/1168720 Reviewed-by: yuli <yuli@chromium.org> Tested-by: Sheng-hao Tsao <shenghao@google.com> [modify] https://crrev.com/444c96cd564208c6909dfcd9733a2736b1390cea/src/js/models/file_system.js
Comment 1 by bugdroid1@chromium.org
, Jul 13