Move multiple UI surfaces check to PageActionHandler.

chrome/common/extensions/api/extension_action/page_action_handler.cc

 // Copyright (c) 2013 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/common/extensions/api/extension_action/page_action_handler.h"
 
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
@@ skipping 38 matching lines @@
       return false;
     }
   } else if (extension->manifest()->HasKey(keys::kPageAction)) {
     if (!extension->manifest()->GetDictionary(keys::kPageAction,
                                               &page_action_value)) {
       *error = ASCIIToUTF16(errors::kInvalidPageAction);
       return false;
     }
   }
 
+  // An extension cannot have both browser and page actions.
+  if (extension->manifest()->HasKey(keys::kBrowserAction)) {

[Matt Perry, 2013/05/30 23:16:14]

The asymmetry of this bothers me (as in, why not put this in the
BrowserActionHandler? What would we do if we had a third UI surface?)... but I
don't have a better solution. 

[Yoyo Zhou, 2013/05/30 23:24:11]

It's kind of a hack. A better or worse hack would be to put the check in
BrowserActionHandler too.

Less of a hack would be a post-Parse step where we introduce registered
constraints checkers. But this check is simple enough that it doesn't warrant
that kind of complexity.

+    *error = ASCIIToUTF16(errors::kOneUISurfaceOnly);
+    return false;
+  }
+
   // If page_action_value is not NULL, then there was a valid page action.
   if (page_action_value) {
     page_action_info = ActionInfo::Load(extension, page_action_value, error);
     if (!page_action_info)
       return false;  // Failed to parse page action definition.
   }
   ActionInfo::SetPageActionInfo(extension, page_action_info.release());
 
   return true;
 }
@@ skipping 15 matching lines @@
 }
 
 const std::vector<std::string> PageActionHandler::Keys() const {
   std::vector<std::string> keys;
   keys.push_back(keys::kPageAction);
   keys.push_back(keys::kPageActions);
   return keys;
 }
 
 }  // namespace extensions