0

assistant: add new entry point icon resource id

- This CL also rolls dep as the following:

  Roll src/chromeos/assistant/internal/ 4a629f07b..366dc486f (1 commit)

  4a629f07bb..366dc486f8

  Created with:
    roll-dep src/chromeos/assistant/internal

Bug: b:380089265
Test: na
Change-Id: Iab014305e8d1d67a6ec63efacbe078bbe8107617
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6092095
Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org>
Commit-Queue: Yuki Awano <yawano@google.com>
Cr-Commit-Position: refs/heads/main@{#1397034}
This commit is contained in:
Yuki Awano
2024-12-16 15:15:18 -08:00
committed by Chromium LUCI CQ
parent ca8d5d11c2
commit a3750e4e4b
6 changed files with 59 additions and 2 deletions

2
DEPS

@ -4173,7 +4173,7 @@ deps = {
'src/chromeos/assistant/internal': {
'url': Var('chrome_git') + '/chrome/assistant.git' + '@' +
'4a629f07bb5192d38397131cbbec303d81ac1179',
'366dc486f8f18d097f22acb469b8eab41b14c9ad',
'condition': 'checkout_src_internal and checkout_chromeos',
},

@ -24,3 +24,25 @@ component("shared") {
deps = [ "//base:base" ]
}
source_set("new_entry_point_constants") {
if (is_chromeos && is_chrome_branded) {
deps = [ "//chromeos/assistant/internal:new_entry_point_constants" ]
} else {
deps = [ ":new_entry_point_constants_placeholder" ]
}
}
source_set("new_entry_point_constants_placeholder") {
sources = [ "new_entry_point_constants.cc" ]
deps = [
":new_entry_point_constants_interface",
"//chrome/app/theme:theme_resources_grit",
]
}
source_set("new_entry_point_constants_interface") {
sources = [ "new_entry_point_constants.h" ]
deps = [ "//base" ]
}

@ -0,0 +1,5 @@
specific_include_rules = {
"new_entry_point_constants.cc": [
"+chrome/grit",
]
}

@ -0,0 +1,14 @@
// Copyright 2024 The Chromium Authors
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chromeos/services/assistant/public/shared/new_entry_point_constants.h"
#include "chrome/grit/theme_resources.h"
namespace chromeos::assistant {
// Use `IDR_PRODUCT_LOGO_32` as a placeholder.
const int kIconResourceId = IDR_PRODUCT_LOGO_32;
} // namespace chromeos::assistant

@ -0,0 +1,16 @@
// Copyright 2024 The Chromium Authors
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROMEOS_SERVICES_ASSISTANT_PUBLIC_SHARED_NEW_ENTRY_POINT_CONSTANTS_H_
#define CHROMEOS_SERVICES_ASSISTANT_PUBLIC_SHARED_NEW_ENTRY_POINT_CONSTANTS_H_
#include "base/component_export.h"
namespace chromeos::assistant {
COMPONENT_EXPORT(ASSISTANT_SERVICE_SHARED) extern const int kIconResourceId;
}
#endif // CHROMEOS_SERVICES_ASSISTANT_PUBLIC_SHARED_NEW_ENTRY_POINT_CONSTANTS_H_