Make a platform-independent ToolbarActionViewController

chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

 // Copyright 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.
 
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #import "chrome/browser/app_controller_mac.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/api/tabs/tabs_api.h"
 #include "chrome/browser/extensions/extension_action.h"
-#include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/location_bar_controller.h"
 #include "chrome/browser/extensions/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"
 #include "chrome/browser/ui/browser_instant_controller.h"
@@ skipping 45 matching lines @@
 using content::WebContents;
 
 namespace {
 
 // Vertical space between the bottom edge of the location_bar and the first run
 // bubble arrow point.
 const static int kFirstRunBubbleYOffset = 1;
 
 // Functor for moving BookmarkManagerPrivate page actions to the right via
 // stable_partition.
-class IsPageActionViewRightAligned {
- public:
-  explicit IsPageActionViewRightAligned(ExtensionService* extension_service)
-      : extension_service_(extension_service) {}
+bool PageActionHasBoomarkManagerPrivate(PageActionDecoration* decoration) {

[Avi (use Gerrit), 2014/10/30 23:21:26]

Fix typo: "boomark"?

[Devlin, 2014/10/31 17:50:43]

It was just in Halloween spirit! ;)

+  return decoration->GetExtension()->permissions_data()->HasAPIPermission(
+      extensions::APIPermission::kBookmarkManagerPrivate);
+}
 
-  bool operator()(PageActionDecoration* page_action_decoration) {
-    return extension_service_
-        ->GetExtensionById(
-              page_action_decoration->page_action()->extension_id(), false)
-        ->permissions_data()
-        ->HasAPIPermission(extensions::APIPermission::kBookmarkManagerPrivate);
-  }
-
- private:
-  ExtensionService* extension_service_;
-
-  // NOTE: Can't DISALLOW_COPY_AND_ASSIGN as we pass this object by value to
-  // std::stable_partition().
-};
-
-}
+}  // namespace
 
 // TODO(shess): This code is mostly copied from the gtk
 // implementation.  Make sure it's all appropriate and flesh it out.
 
 LocationBarViewMac::LocationBarViewMac(AutocompleteTextField* field,
                                        CommandUpdater* command_updater,
                                        Profile* profile,
                                        Browser* browser)
     : LocationBar(profile),
       OmniboxEditController(command_updater),
@@ skipping 111 matching lines @@
 
 void LocationBarViewMac::UpdateBookmarkStarVisibility() {
   star_decoration_->SetVisible(IsStarEnabled());
 }
 
 bool LocationBarViewMac::ShowPageActionPopup(
     const extensions::Extension* extension, bool grant_active_tab) {
   for (ScopedVector<PageActionDecoration>::iterator iter =
            page_action_decorations_.begin();
        iter != page_action_decorations_.end(); ++iter) {
-    if ((*iter)->page_action()->extension_id() == extension->id())
+    if ((*iter)->GetExtension() == extension)
       return (*iter)->ActivatePageAction(grant_active_tab);
   }
   return false;
 }
 
 void LocationBarViewMac::UpdateOpenPDFInReaderPrompt() {
   // Not implemented on Mac.
 }
 
 void LocationBarViewMac::UpdateGeneratedCreditCardView() {
@@ skipping 30 matching lines @@
   int result = 0;
   for (size_t i = 0; i < page_action_decorations_.size(); ++i) {
     if (page_action_decorations_[i]->IsVisible())
       ++result;
   }
   return result;
 }
 
 ExtensionAction* LocationBarViewMac::GetPageAction(size_t index) {
   if (index < page_action_decorations_.size())
-    return page_action_decorations_[index]->page_action();
+    return page_action_decorations_[index]->GetPageAction();
   NOTREACHED();
   return NULL;
 }
 
 ExtensionAction* LocationBarViewMac::GetVisiblePageAction(size_t index) {
   size_t current = 0;
   for (size_t i = 0; i < page_action_decorations_.size(); ++i) {
     if (page_action_decorations_[i]->IsVisible()) {
       if (current == index)
-        return page_action_decorations_[i]->page_action();
+        return page_action_decorations_[i]->GetPageAction();
 
       ++current;
     }
   }
 
   NOTREACHED();
   return NULL;
 }
 
 void LocationBarViewMac::TestPageActionPressed(size_t index) {
@@ skipping 183 matching lines @@
     return;
   RefreshPageActionDecorations();
   Layout();
 
   PageActionDecoration* decoration = GetPageActionDecoration(page_action);
   DCHECK(decoration);
   if (!decoration)
     return;
 
   decoration->set_preview_enabled(preview_enabled);
-  decoration->UpdateVisibility(contents, GetToolbarModel()->GetURL());
+  decoration->UpdateVisibility(contents);
 }
 
 NSRect LocationBarViewMac::GetPageActionFrame(ExtensionAction* page_action) {
   PageActionDecoration* decoration = GetPageActionDecoration(page_action);
   if (!decoration)
     return NSZeroRect;
 
   AutocompleteTextFieldCell* cell = [field_ cell];
   NSRect frame = [cell frameForDecoration:decoration inFrame:[field_ bounds]];
   return frame;
@@ skipping 122 matching lines @@
 
 void LocationBarViewMac::PostNotification(NSString* notification) {
   [[NSNotificationCenter defaultCenter] postNotificationName:notification
                                         object:[NSValue valueWithPointer:this]];
 }
 
 PageActionDecoration* LocationBarViewMac::GetPageActionDecoration(
     ExtensionAction* page_action) {
   DCHECK(page_action);
   for (size_t i = 0; i < page_action_decorations_.size(); ++i) {
-    if (page_action_decorations_[i]->page_action() == page_action)
+    if (page_action_decorations_[i]->GetPageAction() == page_action)
       return page_action_decorations_[i];
   }
   // If |page_action| is the browser action of an extension, no element in
   // |page_action_decorations_| will match.
   NOTREACHED();
   return NULL;
 }
 
-
 void LocationBarViewMac::DeletePageActionDecorations() {
   // TODO(shess): Deleting these decorations could result in the cell
   // refering to them before things are laid out again.  Meanwhile, at
   // least fail safe.
   [[field_ cell] clearDecorations];
 
   page_action_decorations_.clear();
 }
 
 void LocationBarViewMac::OnEditBookmarksEnabledChanged() {
@@ skipping 19 matching lines @@
 
   if (new_page_actions != page_actions_) {
     page_actions_.swap(new_page_actions);
     DeletePageActionDecorations();
     for (size_t i = 0; i < page_actions_.size(); ++i) {
       page_action_decorations_.push_back(
           new PageActionDecoration(this, browser_, page_actions_[i]));
     }
 
     // Move rightmost extensions to the start.
-    std::stable_partition(
-        page_action_decorations_.begin(),
-        page_action_decorations_.end(),
-        IsPageActionViewRightAligned(
-            extensions::ExtensionSystem::Get(profile())->extension_service()));
+    std::stable_partition(page_action_decorations_.begin(),
+                          page_action_decorations_.end(),
+                          PageActionHasBoomarkManagerPrivate);
   }
 
   GURL url = GetToolbarModel()->GetURL();
   for (size_t i = 0; i < page_action_decorations_.size(); ++i) {
     page_action_decorations_[i]->UpdateVisibility(
-        GetToolbarModel()->input_in_progress() ? NULL : web_contents, url);
+        GetToolbarModel()->input_in_progress() ? NULL : web_contents);
   }
 }
 
 bool LocationBarViewMac::RefreshContentSettingsDecorations() {
   const bool input_in_progress = GetToolbarModel()->input_in_progress();
   WebContents* web_contents = input_in_progress ?
       NULL : browser_->tab_strip_model()->GetActiveWebContents();
   bool icons_updated = false;
   for (size_t i = 0; i < content_setting_decorations_.size(); ++i) {
     icons_updated |=
@@ skipping 46 matching lines @@
 }
 
 bool LocationBarViewMac::UpdateMicSearchDecorationVisibility() {
   bool is_visible = !GetToolbarModel()->input_in_progress() &&
                     browser_->search_model()->voice_search_supported();
   if (mic_search_decoration_->IsVisible() == is_visible)
     return false;
   mic_search_decoration_->SetVisible(is_visible);
   return true;
 }