Move ExtensionAction from common/ to browser/.

chrome/browser/extensions/api/extension_action/extension_page_actions_api.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/extensions/api/extension_action/extension_page_actions_api.h"
 
 #include <string>
 
 #include "base/string_number_conversions.h"
 #include "chrome/browser/extensions/api/extension_action/extension_page_actions_api_constants.h"
+#include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/extensions/extension_tab_util.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/ui/browser_list.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/extensions/extension.h"
-#include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/extensions/extension_error_utils.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 
 using content::NavigationEntry;
 
 namespace keys = extension_page_actions_api_constants;
 
 namespace {
 // Errors.
@@ skipping 27 matching lines @@
   if (enable) {
     // Both of those are optional.
     if (action->HasKey(keys::kTitleKey))
       EXTENSION_FUNCTION_VALIDATE(action->GetString(keys::kTitleKey, &title));
     if (action->HasKey(keys::kIconIdKey)) {
       EXTENSION_FUNCTION_VALIDATE(action->GetInteger(keys::kIconIdKey,
                                                      &icon_id));
     }
   }
 
-  ExtensionAction* page_action = GetExtension()->page_action();
+  ExtensionAction* page_action = GetPageAction(profile(), *GetExtension());
   if (!page_action) {
     error_ = kNoPageActionError;
     return false;
   }
 
   if (icon_id < 0 ||
       static_cast<size_t>(icon_id) >= page_action->icon_paths()->size()) {
     error_ = (icon_id == 0) ? kNoIconSpecified : kIconIndexOutOfBounds;
     return false;
   }
@@ skipping 26 matching lines @@
   return true;
 }
 
 bool EnablePageActionsFunction::RunImpl() {
   return SetPageActionEnabled(true);
 }
 
 bool DisablePageActionsFunction::RunImpl() {
   return SetPageActionEnabled(false);
 }