Location chooser

chrome/browser/ui/views/website_settings/permissions_bubble_view.cc

 // Copyright 2014 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/website_settings/permissions_bubble_view.h"
 
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/views/website_settings/permission_selector_view.h"
 #include "chrome/browser/ui/views/website_settings/permission_selector_view_observer.h"
 #include "chrome/browser/ui/website_settings/permission_bubble_request.h"
@@ skipping 149 matching lines @@
   if (index == INDEX_ALLOW)
     return l10n_util::GetStringUTF16(IDS_PERMISSION_ALLOW);
   else
     return l10n_util::GetStringUTF16(IDS_PERMISSION_CUSTOMIZE);
 }
 
 int CustomizeAllowComboboxModel::GetDefaultIndex() const {
   return INDEX_ALLOW;
 }
 
+// A combobox originating on the Allow button allowing for granular geolocation
+// sharing.
+class GeolocationAllowComboboxModel : public ui::ComboboxModel {
+ public:
+  enum Item {

[meacer, 2014/08/15 22:20:25]

nit: This could use a better name, such as GeolocationPrecision.

[mhm, 2014/08/15 23:18:57]

Done.

+    INDEX_EXACT = 0,
+    INDEX_CITY = 1,
+    INDEX_STATE = 2,
+    INDEX_COUNTRY = 3
+  };
+
+  GeolocationAllowComboboxModel() {}
+  virtual ~GeolocationAllowComboboxModel() {}
+
+  virtual int GetItemCount() const OVERRIDE;
+  virtual base::string16 GetItemAt(int index) OVERRIDE;
+  virtual int GetDefaultIndex() const OVERRIDE;
+};
+
+int GeolocationAllowComboboxModel::GetItemCount() const {
+  return 4;

[meacer, 2014/08/15 22:20:25]

Add an INDEX_COUNT to the enum and return it from here.

[mhm, 2014/08/15 23:18:57]

Done.

+}
+
+base::string16 GeolocationAllowComboboxModel::GetItemAt(int index) {
+  switch (index) {
+    case INDEX_EXACT:
+      return l10n_util::GetStringUTF16(IDS_PERMISSION_ALLOW);
+    case INDEX_CITY:
+      return l10n_util::GetStringUTF16(IDS_PERMISSION_CITY);
+    case INDEX_STATE:
+      return l10n_util::GetStringUTF16(IDS_PERMISSION_STATE);
+    default:
+      return l10n_util::GetStringUTF16(IDS_PERMISSION_COUNTRY);
+  }
+}
+
+int GeolocationAllowComboboxModel::GetDefaultIndex() const {
+  return INDEX_EXACT;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // View implementation for the permissions bubble.
 class PermissionsBubbleDelegateView : public views::BubbleDelegateView,
                                       public views::ButtonListener,
                                       public views::ComboboxListener,
                                       public PermissionCombobox::Listener {
  public:
   PermissionsBubbleDelegateView(
       views::View* anchor,
       PermissionBubbleViewViews* owner,
@@ skipping 20 matching lines @@
   virtual void OnPerformAction(views::Combobox* combobox) OVERRIDE;
 
   // PermissionCombobox::Listener:
   virtual void PermissionSelectionChanged(int index, bool allowed) OVERRIDE;
 
  private:
   PermissionBubbleViewViews* owner_;
   views::Button* allow_;
   views::Button* deny_;
   views::Combobox* allow_combobox_;
+  views::Combobox* geolocation_combobox_;
   base::string16 hostname_;
   scoped_ptr<PermissionMenuModel> menu_button_model_;
   std::vector<PermissionCombobox*> customize_comboboxes_;
 
   DISALLOW_COPY_AND_ASSIGN(PermissionsBubbleDelegateView);
 };
 
 PermissionsBubbleDelegateView::PermissionsBubbleDelegateView(
     views::View* anchor,
     PermissionBubbleViewViews* owner,
     const std::vector<PermissionBubbleRequest*>& requests,
     const std::vector<bool>& accept_state,
     bool customization_mode)
     : views::BubbleDelegateView(anchor, views::BubbleBorder::TOP_LEFT),
       owner_(owner),
       allow_(NULL),
       deny_(NULL),
-      allow_combobox_(NULL) {
+      allow_combobox_(NULL),
+      geolocation_combobox_(NULL) {
   DCHECK(!requests.empty());
 
   RemoveAllChildViews(true);
   customize_comboboxes_.clear();
   set_close_on_esc(false);
   set_close_on_deactivate(false);
 
   SetLayoutManager(new views::BoxLayout(
       views::BoxLayout::kVertical, kBubbleOuterMargin, 0, kItemMajorSpacing));
 
   // TODO(gbillock): support other languages than English.
   hostname_ = net::FormatUrl(requests[0]->GetRequestingHostname(),
                              "en",
                              net::kFormatUrlOmitUsernamePassword |
                              net::kFormatUrlOmitTrailingSlashOnBareHostname,
                              net::UnescapeRule::SPACES, NULL, NULL, NULL);
 
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
+
   for (size_t index = 0; index < requests.size(); index++) {
     DCHECK(index < accept_state.size());
     // The row is laid out containing a leading-aligned label area and a
     // trailing column which will be filled during customization with a
     // combobox.
     views::View* row = new views::View();
     views::GridLayout* row_layout = new views::GridLayout(row);
     row->SetLayoutManager(row_layout);
     views::ColumnSet* columns = row_layout->AddColumnSet(0);
     columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::FILL,
@@ skipping 61 matching lines @@
   columns->AddColumn(views::GridLayout::TRAILING, views::GridLayout::FILL,
                      0, views::GridLayout::USE_PREF, 0, 0);
   button_layout->StartRow(0, 0);
 
   // Allow button is a regular button when there's only one option, and a
   // STYLE_ACTION Combobox when there are more than one option and
   // customization is an option.
 
   base::string16 allow_text = l10n_util::GetStringUTF16(IDS_PERMISSION_ALLOW);
   if (requests.size() == 1) {
-    views::LabelButton* allow_button = new views::LabelButton(this, allow_text);
-    allow_button->SetStyle(views::Button::STYLE_BUTTON);
-    button_layout->AddView(allow_button);
-    allow_ = allow_button;
+    if (requests[0]->GetType() == PermissionBubbleRequest::Type::kGeolocation) {

[meacer, 2014/08/15 22:20:25]

nit: You might want to add a comment as to why geolocation gets special
treatment here.

[mhm, 2014/08/15 23:18:57]

Done.

+      views::Combobox* geolocation_combobox =
+          new views::Combobox(new GeolocationAllowComboboxModel());
+      geolocation_combobox->set_listener(this);
+      geolocation_combobox->SetStyle(views::Combobox::STYLE_ACTION);
+      button_layout->AddView(geolocation_combobox);
+      geolocation_combobox_ = geolocation_combobox;
+    } else {
+      views::LabelButton* allow_button =
+          new views::LabelButton(this, allow_text);
+      allow_button->SetStyle(views::Button::STYLE_BUTTON);
+      button_layout->AddView(allow_button);
+      allow_ = allow_button;
+    }
   } else {
     views::Combobox* allow_combobox = new views::Combobox(
         new CustomizeAllowComboboxModel());
     allow_combobox->set_listener(this);
     allow_combobox->SetStyle(views::Combobox::STYLE_ACTION);
     button_layout->AddView(allow_combobox);
     allow_combobox_ = allow_combobox;
   }
 
   base::string16 deny_text = l10n_util::GetStringUTF16(IDS_PERMISSION_DENY);
@@ skipping 63 matching lines @@
 
 void PermissionsBubbleDelegateView::OnPerformAction(
     views::Combobox* combobox) {
   if (combobox == allow_combobox_) {
     if (combobox->selected_index() ==
         CustomizeAllowComboboxModel::INDEX_CUSTOMIZE)
       owner_->SetCustomizationMode();
     else if (combobox->selected_index() ==
              CustomizeAllowComboboxModel::INDEX_ALLOW)
       owner_->Accept();
-  }
+  } else if (combobox == geolocation_combobox_)

[meacer, 2014/08/15 22:20:25]

Braces around if block since the previous block has it.

[mhm, 2014/08/15 23:18:57]

Done.

+    owner_->Accept(combobox->selected_index());
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // PermissionBubbleViewViews
 
 PermissionBubbleViewViews::PermissionBubbleViewViews(views::View* anchor_view)
     : anchor_view_(anchor_view),
       delegate_(NULL),
       bubble_delegate_(NULL) {}
 
@@ skipping 41 matching lines @@
   if (delegate_)
     delegate_->Closing();
 }
 
 void PermissionBubbleViewViews::Toggle(int index, bool value) {
   if (delegate_)
     delegate_->ToggleAccept(index, value);
 }
 
 void PermissionBubbleViewViews::Accept() {
+  Accept(-1);
+}
+
+void PermissionBubbleViewViews::Accept(int choice) {
   if (delegate_)
-    delegate_->Accept();
+    delegate_->Accept(choice);
 }
 
 void PermissionBubbleViewViews::Deny() {
   if (delegate_)
     delegate_->Deny();
 }
 
 void PermissionBubbleViewViews::SetCustomizationMode() {
   if (delegate_)
     delegate_->SetCustomizationMode();
 }