Enable keyboard navigation for Desktopcapture window selection dialog

chrome/browser/ui/views/desktop_media_picker_views.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/desktop_media_picker_views.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/media/desktop_media_list.h"
@@ skipping 188 matching lines @@
   }
 }
 
 DesktopMediaListView::DesktopMediaListView(
     DesktopMediaPickerDialogView* parent,
     scoped_ptr<DesktopMediaList> media_list)
     : parent_(parent),
       media_list_(media_list.Pass()),
       weak_factory_(this) {
   media_list_->SetThumbnailSize(gfx::Size(kThumbnailWidth, kThumbnailHeight));
+
+  // Enable keyboard focus

[Peter Kasting, 2015/09/23 22:43:57]

This comment adds nothing to the code; remove it.

Once that's done you can probably remove the blank line above this too.

[gyzhou, 2015/09/23 23:43:40]

Done.

+  SetFocusable(true);
 }
 
 DesktopMediaListView::~DesktopMediaListView() {}
 
 void DesktopMediaListView::StartUpdating(DesktopMediaID dialog_window_id) {
   media_list_->SetViewDialogWindowId(dialog_window_id);
   media_list_->StartUpdating(this);
 }
 
 void DesktopMediaListView::OnSelectionChanged() {
@@ skipping 217 matching lines @@
 #endif
 
     // Set native window ID if the windows is outside Ash.
     if (!is_ash_window) {
       dialog_window_id.id = AcceleratedWidgetToDesktopMediaId(
           widget->GetNativeWindow()->GetHost()->GetAcceleratedWidget());
     }
   }
 
   list_view_->StartUpdating(dialog_window_id);
+
+  // Request keyboard focus for initial view.

[Peter Kasting, 2015/09/23 22:43:57]

This block should not be necessary because the widget code should already be
doing this (that was the entire point of overriding GetInitiallyFocusedView(),
after all).  Why is it here?

[gyzhou, 2015/09/23 23:43:40]

Done.

+  views::View* initView = GetInitiallyFocusedView();
+  if (initView)
+    initView->RequestFocus();
 }
 
 DesktopMediaPickerDialogView::~DesktopMediaPickerDialogView() {}
 
+views::View* DesktopMediaPickerDialogView::GetInitiallyFocusedView()
+{
+  if (list_view_)

[Peter Kasting, 2015/09/23 22:43:57]

Why null-check this when it can't ever be null?

[gyzhou, 2015/09/23 23:43:40]

Done.

+    return list_view_;
+
+  return NULL;
+}
+
 void DesktopMediaPickerDialogView::DetachParent() {
   parent_ = NULL;
 }
 
 gfx::Size DesktopMediaPickerDialogView::GetPreferredSize() const {
   static const size_t kDialogViewWidth = 600;
   const gfx::Insets title_insets = views::BubbleFrameView::GetTitleInsets();
   size_t label_height =
       label_->GetHeightForWidth(kDialogViewWidth - title_insets.height() * 2);
 
@@ skipping 125 matching lines @@
   content::BrowserThread::PostTask(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(callback_, source));
   callback_.Reset();
 }
 
 // static
 scoped_ptr<DesktopMediaPicker> DesktopMediaPicker::Create() {
   return scoped_ptr<DesktopMediaPicker>(new DesktopMediaPickerViews());
 }