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

Unified Diff: chrome/common/localized_error.cc

Issue 664553007: Cleanup: Put more chrome/ code behind ENABLE_EXTENSIONS ifdefs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: fix android Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/localized_error.h ('k') | chrome/renderer/chrome_content_renderer_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/localized_error.cc
diff --git a/chrome/common/localized_error.cc b/chrome/common/localized_error.cc
index e786c13870ab90ac2e9a50398b087a3607f5aa90..cc50bf3c0b97f93c9780714a1c206350a753472c 100644
--- a/chrome/common/localized_error.cc
+++ b/chrome/common/localized_error.cc
@@ -15,9 +15,6 @@
#include "chrome/grit/generated_resources.h"
#include "components/error_page/common/error_page_params.h"
#include "components/error_page/common/net_error_info.h"
-#include "extensions/common/constants.h"
-#include "extensions/common/extension_icon_set.h"
-#include "extensions/common/manifest_handlers/icons_handler.h"
#include "net/base/escape.h"
#include "net/base/net_errors.h"
#include "net/base/net_util.h"
@@ -29,6 +26,12 @@
#include "base/win/windows_version.h"
#endif
+#if defined(ENABLE_EXTENSIONS)
+#include "extensions/common/constants.h"
+#include "extensions/common/extension_icon_set.h"
+#include "extensions/common/manifest_handlers/icons_handler.h"
+#endif
+
using blink::WebURLError;
// Some error pages have no details.
@@ -847,6 +850,7 @@ bool LocalizedError::HasStrings(const std::string& error_domain,
return LookupErrorMap(error_domain, error_code, /*is_post=*/false) != NULL;
}
+#if defined(ENABLE_EXTENSIONS)
void LocalizedError::GetAppErrorStrings(
const GURL& display_url,
const extensions::Extension* app,
@@ -886,3 +890,4 @@ void LocalizedError::GetAppErrorStrings(
error_strings->Set("suggestionsLearnMore", suggest_learn_more);
#endif // defined(OS_CHROMEOS)
}
+#endif
« no previous file with comments | « chrome/common/localized_error.h ('k') | chrome/renderer/chrome_content_renderer_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698