Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(877)

Side by Side Diff: chrome/common/extensions/extension.cc

Issue 3007008: Cleanup: Break another common->app dependency. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: minor fix Created 10 years, 5 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/chrome_version_info_posix.h.version ('k') | chrome/renderer/renderer_glue.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/extension.h" 5 #include "chrome/common/extensions/extension.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "app/l10n_util.h" 9 #include "app/l10n_util.h"
10 #include "app/resource_bundle.h" 10 #include "app/resource_bundle.h"
11 #include "base/base64.h" 11 #include "base/base64.h"
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/file_path.h" 14 #include "base/file_path.h"
15 #include "base/file_util.h" 15 #include "base/file_util.h"
16 #include "base/file_version_info.h" 16 #include "base/file_version_info.h"
17 #include "base/i18n/rtl.h" 17 #include "base/i18n/rtl.h"
18 #include "base/logging.h" 18 #include "base/logging.h"
19 #include "base/stl_util-inl.h" 19 #include "base/stl_util-inl.h"
20 #include "base/third_party/nss/blapi.h" 20 #include "base/third_party/nss/blapi.h"
21 #include "base/third_party/nss/sha256.h" 21 #include "base/third_party/nss/sha256.h"
22 #include "base/utf_string_conversions.h" 22 #include "base/utf_string_conversions.h"
23 #include "chrome/app/chrome_version_info.h"
24 #include "chrome/common/chrome_constants.h" 23 #include "chrome/common/chrome_constants.h"
25 #include "chrome/common/chrome_switches.h" 24 #include "chrome/common/chrome_switches.h"
25 #include "chrome/common/chrome_version_info.h"
26 #include "chrome/common/extensions/extension_action.h" 26 #include "chrome/common/extensions/extension_action.h"
27 #include "chrome/common/extensions/extension_constants.h" 27 #include "chrome/common/extensions/extension_constants.h"
28 #include "chrome/common/extensions/extension_error_utils.h" 28 #include "chrome/common/extensions/extension_error_utils.h"
29 #include "chrome/common/extensions/extension_l10n_util.h" 29 #include "chrome/common/extensions/extension_l10n_util.h"
30 #include "chrome/common/extensions/extension_resource.h" 30 #include "chrome/common/extensions/extension_resource.h"
31 #include "chrome/common/extensions/user_script.h" 31 #include "chrome/common/extensions/user_script.h"
32 #include "chrome/common/notification_service.h" 32 #include "chrome/common/notification_service.h"
33 #include "chrome/common/url_constants.h" 33 #include "chrome/common/url_constants.h"
34 #include "grit/chromium_strings.h" 34 #include "grit/chromium_strings.h"
35 #include "grit/generated_resources.h" 35 #include "grit/generated_resources.h"
(...skipping 997 matching lines...) Expand 10 before | Expand all | Expand 10 after
1033 } 1033 }
1034 1034
1035 scoped_ptr<Version> minimum_version( 1035 scoped_ptr<Version> minimum_version(
1036 Version::GetVersionFromString(minimum_version_string)); 1036 Version::GetVersionFromString(minimum_version_string));
1037 if (!minimum_version.get()) { 1037 if (!minimum_version.get()) {
1038 *error = errors::kInvalidMinimumChromeVersion; 1038 *error = errors::kInvalidMinimumChromeVersion;
1039 return false; 1039 return false;
1040 } 1040 }
1041 1041
1042 scoped_ptr<FileVersionInfo> current_version_info( 1042 scoped_ptr<FileVersionInfo> current_version_info(
1043 chrome_app::GetChromeVersionInfo()); 1043 chrome::GetChromeVersionInfo());
1044 if (!current_version_info.get()) { 1044 if (!current_version_info.get()) {
1045 DCHECK(false); 1045 DCHECK(false);
1046 return false; 1046 return false;
1047 } 1047 }
1048 1048
1049 scoped_ptr<Version> current_version( 1049 scoped_ptr<Version> current_version(
1050 Version::GetVersionFromString(current_version_info->file_version())); 1050 Version::GetVersionFromString(current_version_info->file_version()));
1051 if (!current_version.get()) { 1051 if (!current_version.get()) {
1052 DCHECK(false); 1052 DCHECK(false);
1053 return false; 1053 return false;
(...skipping 676 matching lines...) Expand 10 before | Expand all | Expand 10 after
1730 } else { 1730 } else {
1731 return false; 1731 return false;
1732 } 1732 }
1733 } else { 1733 } else {
1734 return true; 1734 return true;
1735 } 1735 }
1736 } 1736 }
1737 } 1737 }
1738 return false; 1738 return false;
1739 } 1739 }
OLDNEW
« no previous file with comments | « chrome/common/chrome_version_info_posix.h.version ('k') | chrome/renderer/renderer_glue.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698