Addition of optional giveFocus parameter to experimental.popup.show(...)

chrome/browser/extensions/extension_popup_api.cc

 // Copyright (c) 2009 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/extensions/extension_popup_api.h"
 
 #include "base/gfx/point.h"
 #include "base/json/json_writer.h"
 #include "base/string_util.h"
 #include "chrome/common/extensions/extension.h"
@@ skipping 24 matching lines @@
 const char kBadAnchorArgument[] = "Invalid anchor argument.";
 const char kInvalidURLError[] = "Invalid URL.";
 const char kNotAnExtension[] = "Not an extension view.";
 
 // Keys.
 const wchar_t kUrlKey[] = L"url";
 const wchar_t kWidthKey[] = L"width";
 const wchar_t kHeightKey[] = L"height";
 const wchar_t kTopKey[] = L"top";
 const wchar_t kLeftKey[] = L"left";
+const wchar_t kGiveFocusKey[] = L"giveFocus";
+const wchar_t kDomAnchorKey[] = L"domAnchor";
 
 };  // namespace
 
 PopupShowFunction::PopupShowFunction()
 #if defined (TOOLKIT_VIEWS)
     : popup_(NULL)
 #endif
 {}
 
 void PopupShowFunction::Run() {
@@ skipping 19 matching lines @@
 #endif
 }
 
 bool PopupShowFunction::RunImpl() {
   EXTENSION_FUNCTION_VALIDATE(args_->IsType(Value::TYPE_LIST));
   const ListValue* args = args_as_list();
 
   std::string url_string;
   EXTENSION_FUNCTION_VALIDATE(args->GetString(0, &url_string));
 
+  DictionaryValue* show_details = NULL;
+  EXTENSION_FUNCTION_VALIDATE(args->GetDictionary(1, &show_details));
+
   DictionaryValue* dom_anchor = NULL;
-  EXTENSION_FUNCTION_VALIDATE(args->GetDictionary(1, &dom_anchor));
+  EXTENSION_FUNCTION_VALIDATE(show_details->GetDictionary(kDomAnchorKey,
+                                                          &dom_anchor));
 
   int dom_top, dom_left;
   EXTENSION_FUNCTION_VALIDATE(dom_anchor->GetInteger(kTopKey,
                                                      &dom_top));
   EXTENSION_FUNCTION_VALIDATE(dom_anchor->GetInteger(kLeftKey,
                                                      &dom_left));
 
   int dom_width, dom_height;
   EXTENSION_FUNCTION_VALIDATE(dom_anchor->GetInteger(kWidthKey,
                                                      &dom_width));
   EXTENSION_FUNCTION_VALIDATE(dom_anchor->GetInteger(kHeightKey,
                                                      &dom_height));
   EXTENSION_FUNCTION_VALIDATE(dom_top >= 0 && dom_left >= 0 &&
                               dom_width >= 0 && dom_height >= 0);
 
+  // The default behaviour is to give the focus to the pop-up window.
+  bool give_focus = true;
+  if (show_details->HasKey(kGiveFocusKey)) {
+    EXTENSION_FUNCTION_VALIDATE(show_details->GetBoolean(kGiveFocusKey,
+                                                         &give_focus));
+  }
+
   GURL url = dispatcher()->url().Resolve(url_string);
   if (!url.is_valid()) {
     error_ = kInvalidURLError;
     return false;
   }
 
   // Disallow non-extension requests, or requests outside of the requesting
   // extension view's extension.
   const std::string& extension_id = url.host();
   if (extension_id != dispatcher()->GetExtension()->id() ||
       !url.SchemeIs("chrome-extension")) {
     error_ = kInvalidURLError;
     return false;
   }
 
 #if defined(TOOLKIT_VIEWS)
   gfx::Point origin(dom_left, dom_top);
   if (!ConvertHostPointToScreen(&origin)) {
     error_ = kNotAnExtension;
     return false;
   }
   gfx::Rect rect(origin.x(), origin.y(), dom_width, dom_height);
 
   // Pop-up from extension views (ExtensionShelf, etc.), and drop-down when
   // in a TabContents view.
   BubbleBorder::ArrowLocation arrow_location =
       (NULL != dispatcher()->GetExtensionHost()) ? BubbleBorder::BOTTOM_LEFT :
                                                    BubbleBorder::TOP_LEFT;
   popup_ = ExtensionPopup::Show(url, dispatcher()->GetBrowser(), rect,
-                                arrow_location);
+                                arrow_location, give_focus);
 
   ExtensionPopupHost* popup_host = dispatcher()->GetPopupHost();
   DCHECK(popup_host);
 
   popup_host->set_child_popup(popup_);
   popup_->set_delegate(popup_host);
 #endif  // defined(TOOLKIT_VIEWS)
   return true;
 }
 
@@ skipping 58 matching lines @@
 void PopupEventRouter::OnPopupClosed(Profile* profile,
                                      int routing_id) {
   std::string full_event_name = StringPrintf(
       extension_popup_module_events::kOnPopupClosed,
       routing_id);
 
   profile->GetExtensionMessageService()->DispatchEventToRenderers(
       full_event_name,
       base::JSONWriter::kEmptyArray);
 }