[Mac][Material Design] Adjust EV chip to match Material Design spec.

chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

 // Copyright 2012 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 "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 536 matching lines @@
     omnibox_view_->OnTabChanged(contents);
   else
     omnibox_view_->Update();
   OnChanged();
 }
 
 void LocationBarViewMac::UpdateWithoutTabRestore() {
   Update(nullptr);
 }
 
 void LocationBarViewMac::UpdateLocationIcon() {

[tapted, 2016/04/22 00:41:52]

Should this be UpdateMaterialLocationIcon? I had to poke around a bit to
convince myself that the non-material EV chip's icon wasn't going to change too
:)

   bool inDarkMode = [[field_ window] inIncognitoModeWithSystemTheme];
 
   SkColor vectorIconColor = gfx::kPlaceholderColor;
   gfx::VectorIconId vectorIconId = gfx::VectorIconId::VECTOR_ICON_NONE;
-  const int kIconSize = 16;
+  int iconSize = 16;

[tapted, 2016/04/22 00:41:52]

these should all be hacker_style

const int kDefaultVectorLocationIconSize = 16;
const int kEVBubbleVectorLocationIconSize = 12;

int icon_size = kDefaultLocationIconSize; etc


(inDarkMode should be hacker_style too.. `const bool kInDarkMode` is another
option, but the style guide is a bit vague about whether things declared `const`
that are not *compile time* const, should be kFooSyle or just remain
hacker_style)

[shrike, 2016/04/22 05:46:30]

By "hacker_style" you mean with underbars? This is an ObjectiveC file, and the
convention is camel case? I;m not sure what part of the style guide you are
thinking of.

[tapted, 2016/04/22 06:09:48]

yup - underbars. And the naming scheme for Objective-C isn't based on the file
extension, but on whether it's in an Objective C class, which is easiest to
apply as "any new declarations between @{imlementation,interface,etc.}/@end.
E.g. `web_contents` appears in this file quite a bit, and all the methods take
parameters in hacker_style.

go/cppguide?cl=head#Constant_Names says "Variables declared constexpr or const,
**and whose value is fixed for the duration of the program**, are named with a
leading "k" followed by mixed case."

(i.e. I interpret that as meaning if something is declared `const` but
initialized by a (non-constexpr) method call, then it should not have
kNamingStyle)

[shrike, 2016/04/22 06:24:15]

Ah, OK, I see where I was confused. Thanks.

   if (ShouldShowEVBubble()) {

[tapted, 2016/04/22 00:41:52]

Hm. could this even move into ev_bubble_decoration.mm? It looks like
ev_bubble_decoration_ is either visible or not, but it always has the same
"valid" icon -- there shouldn't ever be a need to call SetImage on it after
construction.

[shrike, 2016/04/22 05:46:30]

In general the icon does not change but that's not always true (if, for example,
you have an Incognito window that has it start of in dark mode and then you
change the theme to a "light" custom theme).

[tapted, 2016/04/22 06:09:48]

wouldn't that need handling for `vectorIconColor` on line 565 to take into
account in_dark_mode

[shrike, 2016/04/22 06:24:15]

The vector icon code is a little screwy (if you ask me). It always takes a
color, but sometimes the color is ignored. In the case of the lock, when you're
in dark mode the color is hard-coded within the icon to be white.

[tapted, 2016/04/25 21:48:10]

Acknowledged.

     vectorIconId = gfx::VectorIconId::LOCATION_BAR_HTTPS_VALID_IN_CHIP;
     vectorIconColor = gfx::kGoogleGreen700;
+    iconSize = 12;
   } else {
     vectorIconId = omnibox_view_->GetVectorIcon(inDarkMode);
     if (inDarkMode) {
       vectorIconColor = SK_ColorWHITE;
     } else {
       NSColor* textColor = OmniboxViewMac::BaseTextColor(inDarkMode);
       // Convert to the device color space before getting the SkColor.
       textColor = [textColor colorUsingColorSpaceName:NSDeviceRGBColorSpace];
       vectorIconColor = skia::NSDeviceColorToSkColor(textColor);
     }
   }
 
   DCHECK(vectorIconId != gfx::VectorIconId::VECTOR_ICON_NONE);
   NSImage* image = NSImageFromImageSkia(gfx::CreateVectorIcon(
-      vectorIconId, kIconSize, vectorIconColor));
+      vectorIconId, iconSize, vectorIconColor));
 
   location_icon_decoration_->SetImage(image);
   ev_bubble_decoration_->SetImage(image);
 
   Layout();
 }
 
 void LocationBarViewMac::UpdateColorsToMatchTheme() {
   if (!ui::MaterialDesignController::IsModeMaterial() ||
       ![[field_ window] inIncognitoMode]) {
@@ skipping 208 matching lines @@
   return zoom_decoration_->UpdateIfNecessary(
       ui_zoom::ZoomController::FromWebContents(web_contents),
       default_zoom_changed,
       inDarkMode);
 }
 
 void LocationBarViewMac::OnDefaultZoomLevelChanged() {
   if (UpdateZoomDecoration(/*default_zoom_changed=*/true))
     OnDecorationsChanged();
 }