Commit e4d89ff6 authored by Yasmin's avatar Yasmin Committed by Commit Bot

Update Shared Clipboard Icon to Copy Icon based on the new mocks.

Bug: 1005813
Change-Id: I355e11ecd6945ca0b49bfeac79a9761b54d4d1a1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1831800
Commit-Queue: Yasmin Molazadeh <yasmo@chromium.org>
Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Reviewed-by: default avatarMichael van Ouwerkerk <mvanouwerkerk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#701146}
parent ed716f08
......@@ -41,6 +41,7 @@ aggregate_vector_icons("chrome_vector_icons") {
"cast_for_education.icon",
"content_paste.icon",
"cookie.icon",
"copy.icon",
"crashed_tab.icon",
"credit_card.icon",
"default_touch_favicon.icon",
......
// Copyright 2019 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.
CANVAS_DIMENSIONS, 24,
MOVE_TO, 16, 1,
H_LINE_TO, 4,
R_CUBIC_TO, -1.1f, 0, -2, 0.9f, -2, 2,
R_V_LINE_TO, 14,
R_H_LINE_TO, 2,
V_LINE_TO, 3,
R_H_LINE_TO, 12,
V_LINE_TO, 1,
CLOSE,
R_MOVE_TO, 3, 4,
H_LINE_TO, 8,
R_CUBIC_TO, -1.1f, 0, -2, 0.9f, -2, 2,
R_V_LINE_TO, 14,
R_CUBIC_TO, 0, 1.1f, 0.9f, 2, 2, 2,
R_H_LINE_TO, 11,
R_CUBIC_TO, 1.1f, 0, 2, -0.9f, 2, -2,
V_LINE_TO, 7,
R_CUBIC_TO, 0, -1.1f, -0.9f, -2, -2, -2,
CLOSE,
R_MOVE_TO, 0, 16,
H_LINE_TO, 8,
V_LINE_TO, 7,
R_H_LINE_TO, 11,
R_V_LINE_TO, 14,
CLOSE
......@@ -7,7 +7,6 @@
#include "base/bind.h"
#include "build/build_config.h"
#include "chrome/app/chrome_command_ids.h"
#include "chrome/app/vector_icons/vector_icons.h"
#include "chrome/browser/renderer_context_menu/render_view_context_menu.h"
#include "chrome/browser/sharing/shared_clipboard/feature_flags.h"
#include "chrome/browser/sharing/shared_clipboard/shared_clipboard_ui_controller.h"
......@@ -77,7 +76,7 @@ void SharedClipboardContextMenuObserver::InitMenu(
l10n_util::GetStringFUTF16(
IDS_CONTENT_CONTEXT_SHARING_SHARED_CLIPBOARD_SINGLE_DEVICE,
base::UTF8ToUTF16(devices[0]->client_name())),
kSendTabToSelfIcon);
controller_->GetVectorIcon());
#endif
} else {
BuildSubMenu();
......@@ -91,7 +90,7 @@ void SharedClipboardContextMenuObserver::InitMenu(
proxy_->AddSubMenuWithStringIdAndIcon(
IDC_CONTENT_CONTEXT_SHARING_SHARED_CLIPBOARD_MULTIPLE_DEVICES,
IDS_CONTENT_CONTEXT_SHARING_SHARED_CLIPBOARD_MULTIPLE_DEVICES,
sub_menu_model_.get(), kSendTabToSelfIcon);
sub_menu_model_.get(), controller_->GetVectorIcon());
#endif
}
}
......
......@@ -99,7 +99,7 @@ base::string16 SharedClipboardUiController::GetErrorDialogText() const {
}
const gfx::VectorIcon& SharedClipboardUiController::GetVectorIcon() const {
return kSendTabToSelfIcon;
return kCopyIcon;
}
base::string16 SharedClipboardUiController::GetTextForTooltipAndAccessibleName()
......
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