GTK Keyboard Support for New Autofill

chrome/browser/autofill/autofill_popup_view.cc

 // Copyright (c) 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.
 
 #include "chrome/browser/autofill/autofill_popup_view.h"
 
 #include "base/logging.h"
 #include "chrome/browser/autofill/autofill_external_delegate.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 
 AutofillPopupView::AutofillPopupView(
     content::WebContents* web_contents,
     AutofillExternalDelegate* external_delegate)
     : external_delegate_(external_delegate),
-      selected_line_(-1) {
+      selected_line_(kNoSelection) {
+  if (!web_contents)
+    return;
+
   registrar_.Add(this,
                  content::NOTIFICATION_WEB_CONTENTS_HIDDEN,
                  content::Source<content::WebContents>(web_contents));
   registrar_.Add(
       this,
       content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::Source<content::NavigationController>(
           &(web_contents->GetController())));
 }
 
@@ skipping 17 matching lines @@
 
   separator_index_ = separator_index;
 
   ShowInternal();
 }
 
 void AutofillPopupView::SetSelectedLine(int selected_line) {
   if (selected_line_ == selected_line)
     return;
 
-  if (selected_line_ != -1)
+  if (selected_line_ != kNoSelection)
     InvalidateRow(selected_line_);
 
-  if (selected_line != -1)
+  if (selected_line != kNoSelection)
     InvalidateRow(selected_line);
 
   selected_line_ = selected_line;
 
-  if (selected_line_ != -1) {
+  if (selected_line_ != kNoSelection) {
     external_delegate_->SelectAutofillSuggestionAtIndex(
         autofill_unique_ids_[selected_line_],
         selected_line);
   }
 }
 
+void AutofillPopupView::SelectNextLine() {
+  int new_selected_line = selected_line_ + 1;
+
+  if (new_selected_line == static_cast<int>(autofill_values_.size()))
+    new_selected_line = 0;
+
+  SetSelectedLine(new_selected_line);
+}
+
+void AutofillPopupView::SelectPreviousLine() {
+  int new_selected_line = selected_line_ - 1;
+
+  if (new_selected_line <= kNoSelection)
+    new_selected_line = autofill_values_.size() - 1;
+
+  SetSelectedLine(new_selected_line);
+}
+
+bool AutofillPopupView::AcceptSelectedLine() {
+  if (selected_line_ == kNoSelection)
+    return false;
+
+  DCHECK_GE(selected_line_, 0);
+  DCHECK_LT(selected_line_, static_cast<int>(autofill_values_.size()));
+
+  return external_delegate()->DidAcceptAutofillSuggestions(
+      autofill_values_[selected_line_],
+      autofill_unique_ids_[selected_line_],
+      selected_line_);
+}
+
+bool AutofillPopupView::RemoveSelectedLine() {
+  if (selected_line_ == kNoSelection)
+    return false;
+
+  // TODO(csharp) add removal code.
+  return false;
+}
+
 void AutofillPopupView::Observe(int type,
                                 const content::NotificationSource& source,
                                 const content::NotificationDetails& details) {
   if (type == content::NOTIFICATION_WEB_CONTENTS_HIDDEN
       || type == content::NOTIFICATION_NAV_ENTRY_COMMITTED)
     Hide();
 }