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

Unified Diff: chrome/browser/ui/cocoa/device_chooser_content_view_cocoa.mm

Issue 2644903004: Move around more vector icons. (Closed)
Patch Set: fix comment Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/device_chooser_content_view_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/device_chooser_content_view_cocoa.mm b/chrome/browser/ui/cocoa/device_chooser_content_view_cocoa.mm
index 7067b8ce1b58d02c7713a80ddeef439e1960cf04..ac012745a5915ec9a802a9bf0bbe97f208100eed 100644
--- a/chrome/browser/ui/cocoa/device_chooser_content_view_cocoa.mm
+++ b/chrome/browser/ui/cocoa/device_chooser_content_view_cocoa.mm
@@ -9,6 +9,7 @@
#include "base/macros.h"
#include "base/strings/sys_string_conversions.h"
+#include "chrome/app/vector_icons/vector_icons.h"
#include "chrome/browser/chooser_controller/chooser_controller.h"
#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_button.h"
#include "chrome/browser/ui/cocoa/spinner_view.h"
@@ -21,7 +22,6 @@
#include "ui/gfx/color_palette.h"
#include "ui/gfx/image/image_skia_util_mac.h"
#include "ui/gfx/paint_vector_icon.h"
-#include "ui/gfx/vector_icons_public.h"
#include "ui/resources/grit/ui_resources.h"
namespace {
@@ -147,8 +147,8 @@ base::scoped_nsobject<NSTextField> CreateLabel(NSString* text) {
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
NSImage* image = nullptr;
if (isConnected) {
- image = gfx::NSImageFromImageSkia(gfx::CreateVectorIcon(
- gfx::VectorIconId::BLUETOOTH_CONNECTED, gfx::kChromeIconGrey));
+ image = gfx::NSImageFromImageSkia(
+ gfx::CreateVectorIcon(kBluetoothConnectedIcon, gfx::kChromeIconGrey));
} else if (level != -1) {
DCHECK_GE(level, 0);
DCHECK_LT(level, base::checked_cast<NSInteger>(
@@ -856,7 +856,7 @@ void ChooserContentViewController::UpdateTableView() {
if (chooserController_->IsConnected(rowIndex)) {
[[self tableRowViewImage:rowIndex]
setImage:gfx::NSImageFromImageSkia(gfx::CreateVectorIcon(
- gfx::VectorIconId::BLUETOOTH_CONNECTED,
+ kBluetoothConnectedIcon,
isSelected ? SK_ColorWHITE : gfx::kChromeIconGrey))];
} else {
int signalStrengthLevel =

Powered by Google App Engine
This is Rietveld 408576698