Create ExtensionActionView class

chrome/browser/ui/views/location_bar/location_bar_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/ui/views/location_bar/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h"
-#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/location_bar_controller.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/instant_service.h"
 #include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/translate/translate_service.h"
@@ skipping 29 matching lines @@
 #include "chrome/browser/ui/views/passwords/manage_passwords_icon_view.h"
 #include "chrome/browser/ui/zoom/zoom_controller.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/translate/core/browser/language_state.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
-#include "extensions/browser/extension_system.h"
+#include "extensions/browser/extension_registry.h"
 #include "extensions/common/feature_switch.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "grit/component_scaled_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
@@ skipping 79 matching lines @@
 
 int GetEditLeadingInternalSpace() {
   // The textfield has 1 px of whitespace before the text in the RTL case only.
   return base::i18n::IsRTL() ? 1 : 0;
 }
 
 // Functor for moving BookmarkManagerPrivate page actions to the right via
 // stable_partition.
 class IsPageActionViewRightAligned {
  public:
-  explicit IsPageActionViewRightAligned(ExtensionService* extension_service)
-      : extension_service_(extension_service) {}
+  explicit IsPageActionViewRightAligned(
+      extensions::ExtensionRegistry* extension_registry)
+      : extension_registry_(extension_registry) {}
 
   bool operator()(PageActionWithBadgeView* page_action_view) {
-    return extension_service_
-        ->GetExtensionById(
-              page_action_view->image_view()->page_action()->extension_id(),
-              false)
-        ->permissions_data()
-        ->HasAPIPermission(extensions::APIPermission::kBookmarkManagerPrivate);
+    return extension_registry_->enabled_extensions().GetByID(
+        page_action_view->image_view()->extension_action()->extension_id())->
+        permissions_data()->
+        HasAPIPermission(extensions::APIPermission::kBookmarkManagerPrivate);
   }
 
  private:
-  ExtensionService* extension_service_;
+  extensions::ExtensionRegistry* extension_registry_;
 
   // NOTE: Can't DISALLOW_COPY_AND_ASSIGN as we pass this object by value to
   // std::stable_partition().
 };
 
 }  // namespace
 
 
 // LocationBarView -----------------------------------------------------------
 
@@ skipping 308 matching lines @@
   WebContents* web_contents = GetWebContents();
 
   RefreshPageActionViews();
   PageActionWithBadgeView* page_action_view =
       static_cast<PageActionWithBadgeView*>(GetPageActionView(page_action));
   DCHECK(page_action_view);
   if (!page_action_view)
     return;
 
   page_action_view->image_view()->set_preview_enabled(preview_enabled);
-  page_action_view->UpdateVisibility(web_contents, GetToolbarModel()->GetURL());
+  page_action_view->UpdateVisibility(web_contents);
   Layout();
   SchedulePaint();
 }
 
 PageActionWithBadgeView* LocationBarView::GetPageActionView(
     ExtensionAction* page_action) {
   DCHECK(page_action);
   for (PageActionViews::const_iterator i(page_action_views_.begin());
        i != page_action_views_.end(); ++i) {
-    if ((*i)->image_view()->page_action() == page_action)
+    if ((*i)->image_view()->extension_action() == page_action)
       return *i;
   }
   return NULL;
 }
 
 void LocationBarView::SetStarToggled(bool on) {
   if (star_view_)
     star_view_->SetToggled(on);
 }
 
@@ skipping 611 matching lines @@
   if (is_popup_mode_)
     return false;
 
   bool changed = false;
 
   // Remember the previous visibility of the page actions so that we can
   // notify when this changes.
   std::map<ExtensionAction*, bool> old_visibility;
   for (PageActionViews::const_iterator i(page_action_views_.begin());
        i != page_action_views_.end(); ++i) {
-    old_visibility[(*i)->image_view()->page_action()] = (*i)->visible();
+    old_visibility[(*i)->image_view()->extension_action()] = (*i)->visible();
   }
 
   PageActions new_page_actions;
 
   WebContents* web_contents = GetWebContents();
   if (web_contents) {
     extensions::TabHelper* extensions_tab_helper =
         extensions::TabHelper::FromWebContents(web_contents);
     extensions::LocationBarController* controller =
         extensions_tab_helper->location_bar_controller();
@@ skipping 15 matching lines @@
           delegate_->CreatePageActionImageView(this, *i));
       page_action_view->SetVisible(false);
       page_action_views_.push_back(page_action_view);
     }
 
     // Move rightmost extensions to the start.
     std::stable_partition(
         page_action_views_.begin(),
         page_action_views_.end(),
         IsPageActionViewRightAligned(
-            extensions::ExtensionSystem::Get(profile())->extension_service()));
+            extensions::ExtensionRegistry::Get(profile())));
 
     View* right_anchor = open_pdf_in_reader_view_;
     if (!right_anchor)
       right_anchor = star_view_;
     DCHECK(right_anchor);
 
     // |page_action_views_| are ordered right-to-left.  Add them as children in
     // reverse order so the logical order and visual order match for
     // accessibility purposes.
     for (PageActionViews::reverse_iterator i = page_action_views_.rbegin();
          i != page_action_views_.rend(); ++i)
       AddChildViewAt(*i, GetIndexOf(right_anchor));
   }
 
   if (!page_action_views_.empty() && web_contents) {
-    Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
-    GURL url = browser->tab_strip_model()->GetActiveWebContents()->GetURL();
-
     for (PageActionViews::const_iterator i(page_action_views_.begin());
          i != page_action_views_.end(); ++i) {
       (*i)->UpdateVisibility(
-          GetToolbarModel()->input_in_progress() ? NULL : web_contents, url);
+          GetToolbarModel()->input_in_progress() ? NULL : web_contents);
 
       // Check if the visibility of the action changed and notify if it did.
-      ExtensionAction* action = (*i)->image_view()->page_action();
+      ExtensionAction* action = (*i)->image_view()->extension_action();
       if (old_visibility.find(action) == old_visibility.end() ||
           old_visibility[action] != (*i)->visible()) {
         changed = true;
         content::NotificationService::current()->Notify(
             extensions::NOTIFICATION_EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED,
             content::Source<ExtensionAction>(action),
             content::Details<WebContents>(web_contents));
       }
     }
   }
@@ skipping 221 matching lines @@
   int result = 0;
   for (size_t i = 0; i < page_action_views_.size(); i++) {
     if (page_action_views_[i]->visible())
       ++result;
   }
   return result;
 }
 
 ExtensionAction* LocationBarView::GetPageAction(size_t index) {
   if (index < page_action_views_.size())
-    return page_action_views_[index]->image_view()->page_action();
+    return page_action_views_[index]->image_view()->extension_action();
 
   NOTREACHED();
   return NULL;
 }
 
 ExtensionAction* LocationBarView::GetVisiblePageAction(size_t index) {
   size_t current = 0;
   for (size_t i = 0; i < page_action_views_.size(); ++i) {
     if (page_action_views_[i]->visible()) {
       if (current == index)
-        return page_action_views_[i]->image_view()->page_action();
+        return page_action_views_[i]->image_view()->extension_action();
 
       ++current;
     }
   }
 
   NOTREACHED();
   return NULL;
 }
 
 void LocationBarView::TestPageActionPressed(size_t index) {
   size_t current = 0;
   for (size_t i = 0; i < page_action_views_.size(); ++i) {
     if (page_action_views_[i]->visible()) {
       if (current == index) {
-        page_action_views_[i]->image_view()->ExecuteAction(
-            ExtensionPopup::SHOW);
+        page_action_views_[i]->image_view()->extension_action_view()->
+            ExecuteAction(ExtensionPopup::SHOW, true);
         return;
       }
       ++current;
     }
   }
 
   NOTREACHED();
 }
 
 bool LocationBarView::GetBookmarkStarVisibility() {
@@ skipping 269 matching lines @@
 
 void LocationBarView::ModelChanged(const SearchModel::State& old_state,
                                    const SearchModel::State& new_state) {
   const bool visible = !GetToolbarModel()->input_in_progress() &&
       new_state.voice_search_supported;
   if (mic_search_view_->visible() != visible) {
     mic_search_view_->SetVisible(visible);
     Layout();
   }
 }