remove toolstrips

chrome/browser/extensions/extension_popup_api.cc

 // Copyright (c) 2010 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/json/json_writer.h"
 #include "base/string_util.h"
 #include "chrome/browser/extensions/extension_dom_ui.h"
 #include "chrome/browser/extensions/extension_host.h"
@@ skipping 27 matching lines @@
 
 }  // namespace extension_popup_module_events
 
 namespace {
 
 // Errors.
 const char kBadAnchorArgument[] = "Invalid anchor argument.";
 const char kInvalidURLError[] = "Invalid URL.";
 const char kNotAnExtension[] = "Not an extension view.";
 const char kPopupsDisallowed[] =
-    "Popups are only supported from toolstrip or tab-contents views.";
+    "Popups are only supported from tab-contents views.";
 
 // 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";
 const wchar_t kBorderStyleKey[] = L"borderStyle";
@@ skipping 290 matching lines @@
       registrar_.Add(this, NotificationType::EXTENSION_HOST_DESTROYED,
                      NotificationService::AllSources());
     }
   }
 #else
   SendResponse(false);
 #endif
 }
 
 bool PopupShowFunction::RunImpl() {
-  // Popups may only be displayed from TAB_CONTENTS and EXTENSION_TOOLSTRIP
-  // views.
+  // Popups may only be displayed from TAB_CONTENTS.
   ViewType::Type view_type =
       dispatcher()->render_view_host()->delegate()->GetRenderViewType();
-  if (ViewType::EXTENSION_TOOLSTRIP != view_type &&
-      ViewType::TAB_CONTENTS != view_type) {
+  if (ViewType::TAB_CONTENTS != view_type) {
     error_ = kPopupsDisallowed;
     return false;
   }
 
   std::string url_string;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &url_string));
 
   DictionaryValue* show_details = NULL;
   EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(1, &show_details));
 
@@ skipping 62 matching lines @@
 
   // Get the correct native window to pass to ExtensionPopup.
   // ExtensionFunctionDispatcher::Delegate may provide a custom implementation
   // of this.
   gfx::NativeWindow window =
       dispatcher()->delegate()->GetCustomFrameNativeWindow();
   if (!window)
     window = GetCurrentBrowser()->window()->GetNativeHandle();
 
 #if defined(TOOLKIT_VIEWS)
-  // Pop-up from extension views (ExtensionShelf, etc.), and drop-down when
-  // in a TabContents view.
-  BubbleBorder::ArrowLocation arrow_location =
-      view_type == ViewType::TAB_CONTENTS ?
-          BubbleBorder::TOP_LEFT : BubbleBorder::BOTTOM_LEFT;
+  BubbleBorder::ArrowLocation arrow_location = BubbleBorder::TOP_LEFT;
 
   // ExtensionPopupHost manages it's own lifetime.
   ExtensionPopupHost* popup_host = new ExtensionPopupHost(dispatcher());
   popup_ = ExtensionPopup::Show(url,
                                 GetCurrentBrowser(),
                                 dispatcher()->profile(),
                                 window,
                                 rect,
                                 arrow_location,
                                 give_focus,
                                 false,  // inspect_with_devtools
                                 chrome,
                                 popup_host);  // ExtensionPopup::Observer
 
   // popup_host will handle focus change listening and close the popup when
   // focus leaves the containing views hierarchy.
   popup_->set_close_on_lost_focus(false);
   popup_host->set_popup(popup_);
 #endif  // defined(TOOLKIT_VIEWS)
+
   return true;
 }
 
 void PopupShowFunction::Observe(NotificationType type,
                                 const NotificationSource& source,
                                 const NotificationDetails& details) {
 #if defined(TOOLKIT_VIEWS)
   DCHECK(type == NotificationType::EXTENSION_POPUP_VIEW_READY ||
          type == NotificationType::EXTENSION_HOST_DESTROYED);
   DCHECK(popup_ != NULL);
@@ skipping 20 matching lines @@
   std::string full_event_name = StringPrintf(
       extension_popup_module_events::kOnPopupClosed,
       routing_id);
 
   profile->GetExtensionMessageService()->DispatchEventToRenderers(
       full_event_name,
       base::JSONWriter::kEmptyArray,
       profile->IsOffTheRecord(),
       GURL());
 }