[SiteChip] Add UMA, finish wiring site chip experiment up to the omnibox.

chrome/browser/ui/views/toolbar/site_chip_view.cc

 // Copyright 2013 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.
 
 #include "chrome/browser/ui/views/toolbar/site_chip_view.h"
 
 #include "base/files/file_path.h"
+#include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_icon_image.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/safe_browsing/client_side_detection_host.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/safe_browsing/safe_browsing_tab_observer.h"
 #include "chrome/browser/safe_browsing/ui_manager.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/manifest_handlers/icons_handler.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
+#include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/common/constants.h"
 #include "grit/component_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
@@ skipping 52 matching lines @@
   if (icon_view_)
     icon_view_->SetImage(&icon_image_->image_skia());
 }
 
 
 // SiteChipView ---------------------------------------------------------------
 
 namespace {
 
 const int kEdgeThickness = 5;
-const int k16x16IconLeadingSpacing = 3;
-const int k16x16IconTrailingSpacing = 3;
+const int k16x16IconLeadingSpacing = 1;
+const int k16x16IconTrailingSpacing = 2;

[Greg Billock, 2013/12/12 20:36:37]

This repairs a bad merge I must have made at some point. the leading and
trailing were supposed to slit the previous k16x16IconSpacing value, which was
3. (19-16)

 const int kIconTextSpacing = 3;
 const int kTrailingLabelMargin = 0;
 
 // Detect client-side or SB malware/phishing hits.
 bool IsMalware(const GURL& url, content::WebContents* tab) {
   if (tab->GetURL() != url)
     return false;
 
   safe_browsing::SafeBrowsingTabObserver* sb_observer =
       safe_browsing::SafeBrowsingTabObserver::FromWebContents(tab);
@@ skipping 317 matching lines @@
   if (painter_)
     views::Painter::PaintPainterAt(canvas, painter_, rect);
 
   ToolbarButton::OnPaint(canvas);
 }
 
 // TODO(gbillock): Make the LocationBarView or OmniboxView the listener for
 // this button.
 void SiteChipView::ButtonPressed(views::Button* sender,
                                  const ui::Event& event) {
+  UMA_HISTOGRAM_COUNTS("SiteChip.Pressed", 1);

[msw, 2013/12/12 21:09:54]

Is this worthwhile if you'll have the SiteChipPress user action?

[Greg Billock, 2013/12/12 21:55:31]

I'm not sure. I thought the user actions just go into timing metrics.

+  content::RecordAction(content::UserMetricsAction("SiteChipPress"));

[msw, 2013/12/12 21:09:54]

According to the guide:
https://wiki.corp.google.com/twiki/bin/view/Main/ChromeUserExperienceMetrics
"When adding a new action, run the script
tools/metrics/actions/extract_actions.py --hash (from your Chromium checkout)
which updates the list of actions in tools/metrics/actions/chromeactions.txt
(which you should add to your CL)."

[Greg Billock, 2013/12/12 21:55:31]

Thanks. I haven't used these user actions before.

   toolbar_view_->location_bar()->GetOmniboxView()->SetFocus();
-  toolbar_view_->location_bar()->GetOmniboxView()->SelectAll(true);
   toolbar_view_->location_bar()->GetOmniboxView()->model()->
       SetCaretVisibility(true);
+  toolbar_view_->location_bar()->GetOmniboxView()->ShowURL();
 }
 
 void SiteChipView::WriteDragDataForView(View* sender,
                                         const gfx::Point& press_pt,
                                         OSExchangeData* data) {
   // TODO(gbillock): Consolidate this with the identical logic in
   // LocationBarView.
   content::WebContents* web_contents = toolbar_view_->GetWebContents();
   FaviconTabHelper* favicon_tab_helper =
       FaviconTabHelper::FromWebContents(web_contents);
@@ skipping 19 matching lines @@
 // Note: When OnSafeBrowsingHit would be called, OnSafeBrowsingMatch will
 // have already been called.
 void SiteChipView::OnSafeBrowsingHit(
     const SafeBrowsingUIManager::UnsafeResource& resource) {}
 
 void SiteChipView::OnSafeBrowsingMatch(
     const SafeBrowsingUIManager::UnsafeResource& resource) {
   OnChanged();
 }