Add the "options_ui" extension manifest field.

extensions/common/manifest_handlers/options_page_info.h

Index: extensions/common/manifest_handlers/options_page_info.h
diff --git a/extensions/common/manifest_handlers/options_page_info.h b/extensions/common/manifest_handlers/options_page_info.h
new file mode 100644
index 0000000000000000000000000000000000000000..1ccd163ff60d9706349264abec8fe3da6f4a3a14
--- /dev/null
+++ b/extensions/common/manifest_handlers/options_page_info.h
@@ -0,0 +1,75 @@
+// Copyright 2014 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.
+
+#ifndef EXTENSIONS_COMMON_MANIFEST_HANDLERS_OPTIONS_UI_H_
+#define EXTENSIONS_COMMON_MANIFEST_HANDLERS_OPTIONS_UI_H_
+
+#include <string>
+#include <vector>
+
+#include "base/values.h"
+#include "extensions/common/extension.h"
+#include "extensions/common/manifest_handler.h"
+#include "url/gurl.h"
+
+namespace extensions {
+
+// A class to provide options page configuration settings from the manifest.
+class OptionsPageInfo : public Extension::ManifestData {
+ public:
+  enum OptionsUrlType { OPTIONS_PAGE, OPTIONS_UI_PAGE };

[not at google - send to devlin, 2014/08/29 05:39:25]

When is this used?

[ericzeng, 2014/08/29 16:52:22]

It's used in OptionsPageInfo::FromValues to determine which kind of error to
throw, the options_page error or the options_ui error. 

[ericzeng, 2014/08/29 22:08:51]

Removed (as discussed in person)

+
+  OptionsPageInfo(GURL options_page,

[not at google - send to devlin, 2014/08/29 05:39:25]

const GURL&

and below.

+                  GURL options_ui_page,
+                  bool chrome_styles,
+                  bool open_in_tab);
+  virtual ~OptionsPageInfo();
+
+  // Returns the URL to the given extension's options page. This method supports
+  // both the "options_ui.page" field and the legacy "options_page" field. If
+  // both are present, it will return the value of "options_ui.page".
+  static GURL GetOptionsPage(const Extension* extension);

[not at google - send to devlin, 2014/08/29 05:39:25]

Put line breaks between the method declaration and the next method's comment.

Also this method should return a const GURL&.

[ericzeng, 2014/08/29 22:08:52]

Done.

+  // Returns whether the Chrome user agent stylesheet should be applied to the
+  // given extension's options page.
+  static bool ChromeStyle(const Extension* extension);

[not at google - send to devlin, 2014/08/29 05:39:25]

IsChromeStyle?

[ericzeng, 2014/08/29 16:52:22]

I thought that just naming the method the same thing as the field would be
easiest, I would also prefer something that captured the intent like
"ShouldUseChromeStyle"

[ericzeng, 2014/08/29 22:08:51]

Changed to ShouldUseChromeStyle as discussed in person.

+  // Returns whether the given extension's options page should be opened in a
+  // new tab instead of an embedded popup.
+  static bool OpenInTab(const Extension* extension);
+
+  static scoped_ptr<OptionsPageInfo> FromValues(
+      Extension* extension,
+      const base::Value* options_ui_value,
+      const base::Value* options_page_value,
+      std::vector<InstallWarning>* install_warnings,
+      base::string16* error);
+
+ private:
+  bool LoadOptionsPage(const Extension* extension, base::string16* error);
+
+  GURL options_page_;     // The legacy options_page entry
+  GURL options_ui_page_;  // The options_ui.page entry
+  bool chrome_styles_;
+  bool open_in_tab_;
+};
+
+// Parses the "options_ui" manifest key.
+class OptionsPageManifestHandler : public ManifestHandler {
+ public:
+  OptionsPageManifestHandler();
+  virtual ~OptionsPageManifestHandler();
+
+  virtual bool Parse(Extension* extension, base::string16* error) OVERRIDE;
+  virtual bool Validate(const Extension* extension,
+                        std::string* error,
+                        std::vector<InstallWarning>* warnings) const OVERRIDE;
+
+ private:
+  virtual const std::vector<std::string> Keys() const OVERRIDE;
+
+  DISALLOW_COPY_AND_ASSIGN(OptionsPageManifestHandler);
+};
+
+}  // namespace extensions
+
+#endif  // EXTENSIONS_COMMON_MANIFEST_HANDLERS_OPTIONS_UI_H_