chrome/common/extensions/manifest_handlers/content_scripts_handler.cc - Issue 450053003: Use a qualified path for grit includes in various chrome/ directories.

Side by Side Diff: chrome/common/extensions/manifest_handlers/content_scripts_handler.cc

Issue 450053003: Use a qualified path for grit includes in various chrome/ directories. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: remove webkit strings that no longer exist Created 6 years, 4 months 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/common/extensions/manifest_handlers/automation_unittest.cc ('k') | chrome/common/extensions/manifest_handlers/minimum_chrome_version_checker.cc » ('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) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2013 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/common/extensions/manifest_handlers/content_scripts_handler.h"	5 #include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h"

6	6

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

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

9 #include "base/memory/scoped_ptr.h"	9 #include "base/memory/scoped_ptr.h"

10 #include "base/strings/string_number_conversions.h"	10 #include "base/strings/string_number_conversions.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/values.h"	13 #include "base/values.h"

	14 #include "chrome/grit/generated_resources.h"

14 #include "content/public/common/url_constants.h"	15 #include "content/public/common/url_constants.h"

15 #include "extensions/common/error_utils.h"	16 #include "extensions/common/error_utils.h"

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

17 #include "extensions/common/extension_resource.h"	18 #include "extensions/common/extension_resource.h"

18 #include "extensions/common/manifest_constants.h"	19 #include "extensions/common/manifest_constants.h"

19 #include "extensions/common/manifest_handlers/permissions_parser.h"	20 #include "extensions/common/manifest_handlers/permissions_parser.h"

20 #include "extensions/common/permissions/permissions_data.h"	21 #include "extensions/common/permissions/permissions_data.h"

21 #include "extensions/common/url_pattern.h"	22 #include "extensions/common/url_pattern.h"

22 #include "extensions/common/url_pattern_set.h"	23 #include "extensions/common/url_pattern_set.h"

23 #include "grit/generated_resources.h"

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

25 #include "url/gurl.h"	25 #include "url/gurl.h"

26	26

27 namespace extensions {	27 namespace extensions {

28	28

29 namespace keys = extensions::manifest_keys;	29 namespace keys = extensions::manifest_keys;

30 namespace values = manifest_values;	30 namespace values = manifest_values;

31 namespace errors = manifest_errors;	31 namespace errors = manifest_errors;

32	32

33 namespace {	33 namespace {

(...skipping 441 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
475 if (!IsScriptValid(path, css_script.relative_path(),	475 if (!IsScriptValid(path, css_script.relative_path(),

476 IDS_EXTENSION_LOAD_CSS_FAILED, error))	476 IDS_EXTENSION_LOAD_CSS_FAILED, error))

477 return false;	477 return false;

478 }	478 }

479 }	479 }

480	480

481 return true;	481 return true;

482 }	482 }

483	483

484 } // namespace extensions	484 } // namespace extensions

OLD	NEW