diff options
author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-27 20:03:32 +0000 |
---|---|---|
committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-27 20:03:32 +0000 |
commit | 9d5804f68add5c1ab7bb48be7989d798f0988375 (patch) | |
tree | 3b31ae298d7d2154337ac6622f8b361abef38f0b /chrome/browser/chromeos/customization_document.h | |
parent | 044627eb27f28939855307d4f33cf46af33bd185 (diff) | |
download | chromium_src-9d5804f68add5c1ab7bb48be7989d798f0988375.zip chromium_src-9d5804f68add5c1ab7bb48be7989d798f0988375.tar.gz chromium_src-9d5804f68add5c1ab7bb48be7989d798f0988375.tar.bz2 |
Revert 48424 - Adding initial implementation of the PartnerCustomization classes.
BUG=chromiumos:3176
TEST=Run out/Debug/unit_tests. Run out/Debug/chrome loginmanager startupmanifest=./chrome/browser/chromeos/testdata/startup_manifest.json. There should be no asserts.
Review URL: http://codereview.chromium.org/2101021
TBR=denisromanov@chromium.org
Build error below. I don't immediately see how this CL caused the
problem, but the only other things on the blamelist are valgrind
suppressions which don't change code.
Linking...
LINK : warning LNK4224: /OPT:NOWIN98 is no longer supported; ignored
Creating library C:\b\slave\chromium-rel-builder\build\src\build\Release\lib\npchrome_frame.lib and object C:\b\slave\chromium-rel-builder\build\src\build\Release\lib\npchrome_frame.exp
chrome_tab.obj : error LNK2001: unresolved external symbol "unsigned int (__stdcall* ATL::g_pfnGetThreadACP)(void)" (?g_pfnGetThreadACP@ATL@@3P6GIXZA)
chrome_frame_ie.lib(chrome_active_document.obj) : error LNK2001: unresolved external symbol "unsigned int (__stdcall* ATL::g_pfnGetThreadACP)(void)" (?g_pfnGetThreadACP@ATL@@3P6GIXZA)
chrome_frame_npapi.lib(utils.obj) : error LNK2001: unresolved external symbol "unsigned int (__stdcall* ATL::g_pfnGetThreadACP)(void)" (?g_pfnGetThreadACP@ATL@@3P6GIXZA)
C:\b\slave\chromium-rel-builder\build\src\build\Release\servers\npchrome_frame.dll : fatal error LNK1120: 1 unresolved externals
Error executing link.exe (tool returned code: 1120)
2 build system warning(s):
- VS settings folder not found
- Interoperability reenabled
Review URL: http://codereview.chromium.org/2224008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48428 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/customization_document.h')
-rw-r--r-- | chrome/browser/chromeos/customization_document.h | 115 |
1 files changed, 0 insertions, 115 deletions
diff --git a/chrome/browser/chromeos/customization_document.h b/chrome/browser/chromeos/customization_document.h deleted file mode 100644 index ce9d68a..0000000 --- a/chrome/browser/chromeos/customization_document.h +++ /dev/null @@ -1,115 +0,0 @@ -// Copyright (c) 2010 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 CHROME_BROWSER_CHROMEOS_CUSTOMIZATION_DOCUMENT_H_ -#define CHROME_BROWSER_CHROMEOS_CUSTOMIZATION_DOCUMENT_H_ - -#include <list> -#include <map> -#include <string> - -#include "base/basictypes.h" -#include "base/scoped_ptr.h" -#include "third_party/skia/include/core/SkColor.h" - -class DictionaryValue; -class FilePath; - -namespace chromeos { - -class CustomizationDocument { - public: - CustomizationDocument() {} - virtual ~CustomizationDocument() {} - - virtual bool LoadManifestFromFile(const FilePath& manifest_path); - virtual bool LoadManifestFromString(const std::string& manifest); - - const std::string& version() const { return version_; } - - protected: - // Parses manifest's attributes from the JSON dictionary value. - virtual bool ParseFromJsonValue(const DictionaryValue* root); - - // Manifest version string. - std::string version_; - - DISALLOW_COPY_AND_ASSIGN(CustomizationDocument); -}; - -class StartupCustomizationDocument : public CustomizationDocument { - public: - struct SetupContent { - SetupContent() {} - SetupContent(const std::string& help_page_path, - const std::string& eula_page_path) - : help_page_path(help_page_path), - eula_page_path(eula_page_path) {} - - // Partner's help page for specific locale. - std::string help_page_path; - // Partner's EULA for specific locale. - std::string eula_page_path; - }; - - typedef std::map<std::string, SetupContent> SetupContentMap; - - StartupCustomizationDocument() {} - - const std::string& product_sku() const { return product_sku_; } - const std::string& initial_locale() const { return initial_locale_; } - SkColor background_color() const { return background_color_; } - const std::string& registration_url() const { return registration_url_; } - - const SetupContent* GetSetupContent(const std::string& locale) const; - - protected: - virtual bool ParseFromJsonValue(const DictionaryValue* root); - - // Product SKU. - std::string product_sku_; - - // Initial locale for the OOBE wizard. - std::string initial_locale_; - - // OOBE wizard and login screen background color. - SkColor background_color_; - - // Partner's product registration page URL. - std::string registration_url_; - - // Setup content for different locales. - SetupContentMap setup_content_; - - DISALLOW_COPY_AND_ASSIGN(StartupCustomizationDocument); -}; - -class ServicesCustomizationDocument : public CustomizationDocument { - public: - ServicesCustomizationDocument() {} - - protected: - virtual bool ParseFromJsonValue(const DictionaryValue* root); - - // Partner's welcome page that is opened right after the OOBE. - std::string initial_start_page_; - - // Title for the partner's apps section in apps menu. - std::string app_menu_section_title_; - - // Partner's featured apps URLs. - std::list<std::string> web_apps_; - - // Partner's featured extensions URLs. - std::list<std::string> extensions_; - - // Partner's apps section support page URL. - std::string app_menu_support_page_url_; - - DISALLOW_COPY_AND_ASSIGN(ServicesCustomizationDocument); -}; - -} // namespace chromeos - -#endif // CHROME_BROWSER_CHROMEOS_CUSTOMIZATION_DOCUMENT_H_ |