Commit 2a8c55cf authored by Eugene But's avatar Eugene But Committed by Commit Bot

Added Google Drive icon accessible via BrandedImageProvider.

Bug: 791806
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: Ia98dcc56f5681e033d0ec02dd9714d16ca6f40a6
Reviewed-on: https://chromium-review.googlesource.com/947093
Commit-Queue: Eugene But <eugenebut@chromium.org>
Reviewed-by: default avatarSylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#541623}
parent b26744dd
...@@ -8,6 +8,7 @@ source_set("images") { ...@@ -8,6 +8,7 @@ source_set("images") {
"chromium_branded_image_provider.mm", "chromium_branded_image_provider.mm",
] ]
deps = [ deps = [
"resources:download_drivium",
"//base", "//base",
"//ios/chrome/app/theme", "//ios/chrome/app/theme",
"//ios/chrome/browser/ui/toolbar/buttons/resources:toolbar_search", "//ios/chrome/browser/ui/toolbar/buttons/resources:toolbar_search",
......
...@@ -21,6 +21,7 @@ class ChromiumBrandedImageProvider : public BrandedImageProvider { ...@@ -21,6 +21,7 @@ class ChromiumBrandedImageProvider : public BrandedImageProvider {
bool GetToolbarVoiceSearchButtonImageId(int* image_id) override; bool GetToolbarVoiceSearchButtonImageId(int* image_id) override;
UIImage* GetWhatsNewIconImage(WhatsNewIcon type) override; UIImage* GetWhatsNewIconImage(WhatsNewIcon type) override;
UIImage* GetToolbarSearchButtonImage(SearchEngineIcon type) override; UIImage* GetToolbarSearchButtonImage(SearchEngineIcon type) override;
UIImage* GetDownloadGoogleDriveImage() override;
private: private:
DISALLOW_COPY_AND_ASSIGN(ChromiumBrandedImageProvider); DISALLOW_COPY_AND_ASSIGN(ChromiumBrandedImageProvider);
......
...@@ -59,3 +59,7 @@ UIImage* ChromiumBrandedImageProvider::GetToolbarSearchButtonImage( ...@@ -59,3 +59,7 @@ UIImage* ChromiumBrandedImageProvider::GetToolbarSearchButtonImage(
SearchEngineIcon type) { SearchEngineIcon type) {
return [UIImage imageNamed:@"toolbar_search"]; return [UIImage imageNamed:@"toolbar_search"];
} }
UIImage* ChromiumBrandedImageProvider::GetDownloadGoogleDriveImage() {
return [UIImage imageNamed:@"download_drivium"];
}
# Copyright 2018 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.
import("//build/config/ios/asset_catalog.gni")
imageset("download_drivium") {
sources = [
"download_drivium.imageset/Contents.json",
"download_drivium.imageset/download_drivium.png",
"download_drivium.imageset/download_drivium@2x.png",
"download_drivium.imageset/download_drivium@3x.png",
]
}
{
"images" : [
{
"idiom" : "universal",
"filename" : "download_drivium.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "download_drivium@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "download_drivium@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
...@@ -56,6 +56,10 @@ class BrandedImageProvider { ...@@ -56,6 +56,10 @@ class BrandedImageProvider {
// corresponding to the |type| search engine. // corresponding to the |type| search engine.
virtual UIImage* GetToolbarSearchButtonImage(SearchEngineIcon type); virtual UIImage* GetToolbarSearchButtonImage(SearchEngineIcon type);
// Returns the 24pt x 24pt image to use for the "Download Google Drive" icon
// on Download Manager UI.
virtual UIImage* GetDownloadGoogleDriveImage();
private: private:
DISALLOW_COPY_AND_ASSIGN(BrandedImageProvider); DISALLOW_COPY_AND_ASSIGN(BrandedImageProvider);
}; };
......
...@@ -50,3 +50,7 @@ UIImage* BrandedImageProvider::GetToolbarSearchButtonImage( ...@@ -50,3 +50,7 @@ UIImage* BrandedImageProvider::GetToolbarSearchButtonImage(
SearchEngineIcon type) { SearchEngineIcon type) {
return nil; return nil;
} }
UIImage* BrandedImageProvider::GetDownloadGoogleDriveImage() {
return nil;
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment