summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authortmdiep@chromium.org <tmdiep@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-21 23:19:34 +0000
committertmdiep@chromium.org <tmdiep@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-21 23:19:34 +0000
commitdb378328a94177ed3ad95e421f295cc8e9d3b1d3 (patch)
treeaa37c5411e3bb30c683007ab0d81d586613da883 /apps
parent20bd0b28f6467339e611311aaf241d7eab388578 (diff)
downloadchromium_src-db378328a94177ed3ad95e421f295cc8e9d3b1d3.zip
chromium_src-db378328a94177ed3ad95e421f295cc8e9d3b1d3.tar.gz
chromium_src-db378328a94177ed3ad95e421f295cc8e9d3b1d3.tar.bz2
Do not assign launch ordinals to ephemeral apps
Ephemeral apps are not shown in the app launcher or NTP, but they are assigned ordinals, which results in unfilled NTP pages. This patch does not give ephemeral apps launch ordinals until they are promoted to fully installed apps. AppSorting::MarkExtensionAsHidden() was refactored to AppSorting::SetExtensionVisible() to allow the visibility of the extension in the NTP to change. BUG=394192 TEST=browser_tests Review URL: https://codereview.chromium.org/397903002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284536 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps')
-rw-r--r--apps/shell/browser/shell_app_sorting.cc4
-rw-r--r--apps/shell/browser/shell_app_sorting.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/apps/shell/browser/shell_app_sorting.cc b/apps/shell/browser/shell_app_sorting.cc
index b78d57d..fa16063 100644
--- a/apps/shell/browser/shell_app_sorting.cc
+++ b/apps/shell/browser/shell_app_sorting.cc
@@ -100,8 +100,8 @@ syncer::StringOrdinal ShellAppSorting::PageIntegerAsStringOrdinal(
return syncer::StringOrdinal(kFirstPage);
}
-void ShellAppSorting::MarkExtensionAsHidden(
- const std::string& extension_id) {
+void ShellAppSorting::SetExtensionVisible(const std::string& extension_id,
+ bool visible) {
}
} // namespace apps
diff --git a/apps/shell/browser/shell_app_sorting.h b/apps/shell/browser/shell_app_sorting.h
index 461a3ed..a7f50d6 100644
--- a/apps/shell/browser/shell_app_sorting.h
+++ b/apps/shell/browser/shell_app_sorting.h
@@ -53,7 +53,8 @@ class ShellAppSorting : public extensions::AppSorting {
const syncer::StringOrdinal& page_ordinal) const OVERRIDE;
virtual syncer::StringOrdinal PageIntegerAsStringOrdinal(
size_t page_index) OVERRIDE;
- virtual void MarkExtensionAsHidden(const std::string& extension_id) OVERRIDE;
+ virtual void SetExtensionVisible(const std::string& extension_id,
+ bool visible) OVERRIDE;
private:
DISALLOW_COPY_AND_ASSIGN(ShellAppSorting);