diff options
| author | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-17 00:01:55 +0000 |
|---|---|---|
| committer | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-17 00:01:55 +0000 |
| commit | c1b8c0b0a5f0f3745415f9789141fb9dfb3e4e36 (patch) | |
| tree | 95079f997e8a3ceea528e225e090fead79b9c6d9 /chrome | |
| parent | f1657fa68aeeea977c74b7dffe3a157e0bd91906 (diff) | |
| download | chromium_src-c1b8c0b0a5f0f3745415f9789141fb9dfb3e4e36.zip chromium_src-c1b8c0b0a5f0f3745415f9789141fb9dfb3e4e36.tar.gz chromium_src-c1b8c0b0a5f0f3745415f9789141fb9dfb3e4e36.tar.bz2 | |
Disable options menu button in NTP when app is disabled.
BUG=77192
TEST=Install Google Talk app. Disable from chrome://extensions. Open NTP and open context menu for disabled app. Check that "Options" is disabled.
Review URL: http://codereview.chromium.org/6949004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85566 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/ui/webui/ntp/app_launcher_handler.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc index 3f3ec9b..debc7fa 100644 --- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc +++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc @@ -92,7 +92,9 @@ void AppLauncherHandler::CreateAppInfo(const Extension* extension, value->SetString("name", extension->name()); value->SetString("description", extension->description()); value->SetString("launch_url", extension->GetFullLaunchURL().spec()); - value->SetString("options_url", extension->options_url().spec()); + if (enabled) { + value->SetString("options_url", extension->options_url().spec()); + } value->SetBoolean("can_uninstall", Extension::UserMayDisable(extension->location())); value->SetString("icon_big", icon_big.spec()); |