diff options
| author | dpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-03 12:17:26 +0000 |
|---|---|---|
| committer | dpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-03 12:17:26 +0000 |
| commit | dc6cc4791a83ce08a03ff103c6932d4d6e22cae3 (patch) | |
| tree | 104d67bbdc5ac68a23899ef89c363d6e32bd49fa | |
| parent | 30211cb0af0a89e00c15101b64ca4680ea6e4ec0 (diff) | |
| download | chromium_src-dc6cc4791a83ce08a03ff103c6932d4d6e22cae3.zip chromium_src-dc6cc4791a83ce08a03ff103c6932d4d6e22cae3.tar.gz chromium_src-dc6cc4791a83ce08a03ff103c6932d4d6e22cae3.tar.bz2 | |
Make GetStarted app component extension
BUG=chromium-os:11527
TEST=manual
Review URL: http://codereview.chromium.org/6312089
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73614 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/browser_resources.grd | 7 | ||||
| -rw-r--r-- | chrome/browser/chromeos/login/existing_user_controller.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/app_launcher_handler.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/profiles/profile_impl.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/resources/getstarted/manifest.json | 18 |
5 files changed, 33 insertions, 13 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd index d215bf5..50415f8ee 100644 --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd @@ -101,11 +101,14 @@ without changes to the corresponding grd file. etaa --> <include name="IDR_NETWORK_MENU_JS" file="resources\network_menu.js" flattenhtml="true" type="BINDATA" /> <include name="IDR_WRENCH_MENU_JS" file="resources\wrench_menu.js" flattenhtml="true" type="BINDATA" /> <include name="IDR_WRENCH_MENU_CSS" file="resources\wrench_menu.css" flattenhtml="true" type="BINDATA" /> - <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json" type="BINDATA" /> - <include name="IDR_MOBILE_MANIFEST" file="resources\mobile_app\manifest.json" type="BINDATA" /> <!-- manifest file of ChromeVox accessibility extension --> <include name="IDR_CHROMEVOX_MANIFEST" file="resources\access_chromevox\manifest.json" type="BINDATA" /> </if> + <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')"> + <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json" type="BINDATA" /> + <include name="IDR_GETSTARTED_MANIFEST" file="resources\getstarted\manifest.json" type="BINDATA" /> + <include name="IDR_MOBILE_MANIFEST" file="resources\mobile_app\manifest.json" type="BINDATA" /> + </if> </includes> </release> </grit> diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc index 0cb7e1a..7bf9b0a 100644 --- a/chrome/browser/chromeos/login/existing_user_controller.cc +++ b/chrome/browser/chromeos/login/existing_user_controller.cc @@ -41,15 +41,12 @@ const char kSettingsSyncLoginURL[] = "chrome://settings/personal"; // URL that will be opened on when user logs in first time on the device. const char kGetStartedURL[] = - "chrome-extension://nbaambmfhicobichobkkokacjbaoinda/index.html"; + "chrome-extension://cbmhffdpiobpchciemffincgahkkljig/index.html"; // URL for account creation. const char kCreateAccountURL[] = "https://www.google.com/accounts/NewAccount?service=mail"; -// Path to extracted version of Get Started app. -const char kGetStartedPath[] = "/usr/share/chromeos-assets/getstarted"; - // Used to handle the asynchronous response of deleting a cryptohome directory. class RemoveAttempt : public CryptohomeLibrary::Delegate { public: @@ -363,9 +360,6 @@ void ExistingUserController::OnLoginSuccess( // TODO(nkostylev): May add login UI implementation callback call. if (!known_user && !login_only) { #if defined(OFFICIAL_BUILD) - CommandLine::ForCurrentProcess()->AppendSwitchPath( - switches::kLoadExtension, - FilePath(kGetStartedPath)); CommandLine::ForCurrentProcess()->AppendArg(kGetStartedURL); #endif // OFFICIAL_BUILD diff --git a/chrome/browser/dom_ui/app_launcher_handler.cc b/chrome/browser/dom_ui/app_launcher_handler.cc index f8116b5..14d098c 100644 --- a/chrome/browser/dom_ui/app_launcher_handler.cc +++ b/chrome/browser/dom_ui/app_launcher_handler.cc @@ -192,9 +192,9 @@ void AppLauncherHandler::FillAppDictionary(DictionaryValue* dictionary) { const ExtensionList* extensions = extensions_service_->extensions(); for (ExtensionList::const_iterator it = extensions->begin(); it != extensions->end(); ++it) { - // Don't include the WebStore component app. The WebStore launcher - // gets special treatment in ntp/apps.js. - if ((*it)->is_app() && (*it)->id() != extension_misc::kWebStoreAppId) { + // Don't include the WebStore and other component apps. + // The WebStore launcher gets special treatment in ntp/apps.js. + if ((*it)->is_app() && (*it)->location() != Extension::COMPONENT) { DictionaryValue* app_info = new DictionaryValue(); CreateAppInfo(*it, extensions_service_->extension_prefs(), app_info); list->Append(app_info); diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index f8731b0..ef269c4 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -397,12 +397,17 @@ void ProfileImpl::RegisterComponentExtensions() { IDR_KEYBOARD_MANIFEST)); #endif -#if defined(OS_CHROMEOS) +#if defined(OS_CHROMEOS) && defined(OFFICIAL_BUILD) if (browser_defaults::enable_help_app) { component_extensions.push_back(std::make_pair( FILE_PATH_LITERAL("/usr/share/chromeos-assets/helpapp"), IDR_HELP_MANIFEST)); } + + component_extensions.push_back(std::make_pair( + FILE_PATH_LITERAL("/usr/share/chromeos-assets/getstarted"), + IDR_GETSTARTED_MANIFEST)); + component_extensions.push_back(std::make_pair( FILE_PATH_LITERAL("/usr/share/chromeos-assets/mobile"), IDR_MOBILE_MANIFEST)); diff --git a/chrome/browser/resources/getstarted/manifest.json b/chrome/browser/resources/getstarted/manifest.json new file mode 100644 index 0000000..3b361f9 --- /dev/null +++ b/chrome/browser/resources/getstarted/manifest.json @@ -0,0 +1,18 @@ +{ + "name": "Get Started", + "description": "Get Started", + "version": "1.0.26", + "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDAuFUzjec2nXa5iFEycabbHL9h4ga7hsRGT0LVUlhhfm0tH8OTGzQtzcZG+Skk/stWOHNcd03lSPrPwCEtjJ9pDjtM2I0bYwXrcnVSBx+h9JXnDIJ0zsdVQsjOIknSFunxcedfG0v+yfGAfgamLSpAhAg8Le2pniqDJ24u3nIPjQIDAQAB", + "app": { + "launch": { + "local_path": "index.html" + } + }, + "icons": { + "16": "images/16x16.png", + "128": "images/128x128.png" + }, + "permissions": [ + "tabs" + ] +}
\ No newline at end of file |