chrome/browser/web_applications/web_app.cc - Issue 15239002: Move Extension and PermissionsData to extensions/common.

Side by Side Diff: chrome/browser/web_applications/web_app.cc

Issue 15239002: Move Extension and PermissionsData to extensions/common. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/webui/sync_file_system_internals/file_metadata_handler.cc ('k') | chrome/browser/web_applications/web_app_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/web_applications/web_app.h"	5 #include "chrome/browser/web_applications/web_app.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/bind_helpers.h"	8 #include "base/bind_helpers.h"

9 #include "base/file_util.h"	9 #include "base/file_util.h"

10 #include "base/i18n/file_util_icu.h"	10 #include "base/i18n/file_util_icu.h"

11 #include "base/strings/string_util.h"	11 #include "base/strings/string_util.h"

12 #include "base/strings/utf_string_conversions.h"	12 #include "base/strings/utf_string_conversions.h"

13 #include "base/threading/thread.h"	13 #include "base/threading/thread.h"

14 #include "chrome/common/chrome_constants.h"	14 #include "chrome/common/chrome_constants.h"

15 #include "chrome/common/chrome_version_info.h"	15 #include "chrome/common/chrome_version_info.h"

16 #include "chrome/common/extensions/extension.h"

17 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"	16 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"

18 #include "chrome/common/url_constants.h"	17 #include "chrome/common/url_constants.h"

19 #include "content/public/browser/browser_thread.h"	18 #include "content/public/browser/browser_thread.h"

20 #include "extensions/common/constants.h"	19 #include "extensions/common/constants.h"

	20 #include "extensions/common/extension.h"

21 #include "grit/chromium_strings.h"	21 #include "grit/chromium_strings.h"

22 #include "ui/base/l10n/l10n_util.h"	22 #include "ui/base/l10n/l10n_util.h"

23	23

24 using content::BrowserThread;	24 using content::BrowserThread;

25	25

26 namespace {	26 namespace {

27	27

28 #if defined(TOOLKIT_VIEWS)	28 #if defined(TOOLKIT_VIEWS)

29 // Predicator for sorting images from largest to smallest.	29 // Predicator for sorting images from largest to smallest.

30 bool IconPrecedes(const WebApplicationInfo::IconInfo& left,	30 bool IconPrecedes(const WebApplicationInfo::IconInfo& left,

(...skipping 206 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
237 #endif	237 #endif

238	238

239 string16 GetAppShortcutsSubdirName() {	239 string16 GetAppShortcutsSubdirName() {

240 chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();	240 chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();

241 if (channel == chrome::VersionInfo::CHANNEL_CANARY)	241 if (channel == chrome::VersionInfo::CHANNEL_CANARY)

242 return l10n_util::GetStringUTF16(IDS_APP_SHORTCUTS_SUBDIR_NAME_CANARY);	242 return l10n_util::GetStringUTF16(IDS_APP_SHORTCUTS_SUBDIR_NAME_CANARY);

243 return l10n_util::GetStringUTF16(IDS_APP_SHORTCUTS_SUBDIR_NAME);	243 return l10n_util::GetStringUTF16(IDS_APP_SHORTCUTS_SUBDIR_NAME);

244 }	244 }

245	245

246 } // namespace web_app	246 } // namespace web_app

OLD	NEW