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

Side by Side Diff: chrome/browser/ui/webui/extensions/extension_settings_handler.cc

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 3 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
OLDNEW
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/ui/webui/extensions/extension_settings_handler.h" 5 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
6 6
7 #include "apps/app_load_service.h" 7 #include "apps/app_load_service.h"
8 #include "apps/app_window.h" 8 #include "apps/app_window.h"
9 #include "apps/app_window_registry.h" 9 #include "apps/app_window_registry.h"
10 #include "apps/saved_files_service.h" 10 #include "apps/saved_files_service.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 #include "chrome/browser/ui/extensions/application_launch.h" 54 #include "chrome/browser/ui/extensions/application_launch.h"
55 #include "chrome/browser/ui/webui/extensions/extension_basic_info.h" 55 #include "chrome/browser/ui/webui/extensions/extension_basic_info.h"
56 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" 56 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
57 #include "chrome/common/chrome_switches.h" 57 #include "chrome/common/chrome_switches.h"
58 #include "chrome/common/chrome_version_info.h" 58 #include "chrome/common/chrome_version_info.h"
59 #include "chrome/common/extensions/extension_constants.h" 59 #include "chrome/common/extensions/extension_constants.h"
60 #include "chrome/common/extensions/features/feature_channel.h" 60 #include "chrome/common/extensions/features/feature_channel.h"
61 #include "chrome/common/extensions/manifest_url_handler.h" 61 #include "chrome/common/extensions/manifest_url_handler.h"
62 #include "chrome/common/pref_names.h" 62 #include "chrome/common/pref_names.h"
63 #include "chrome/common/url_constants.h" 63 #include "chrome/common/url_constants.h"
64 #include "chrome/grit/chromium_strings.h"
65 #include "chrome/grit/generated_resources.h"
64 #include "components/google/core/browser/google_util.h" 66 #include "components/google/core/browser/google_util.h"
65 #include "components/pref_registry/pref_registry_syncable.h" 67 #include "components/pref_registry/pref_registry_syncable.h"
66 #include "content/public/browser/notification_service.h" 68 #include "content/public/browser/notification_service.h"
67 #include "content/public/browser/notification_source.h" 69 #include "content/public/browser/notification_source.h"
68 #include "content/public/browser/notification_types.h" 70 #include "content/public/browser/notification_types.h"
69 #include "content/public/browser/render_process_host.h" 71 #include "content/public/browser/render_process_host.h"
70 #include "content/public/browser/render_view_host.h" 72 #include "content/public/browser/render_view_host.h"
71 #include "content/public/browser/site_instance.h" 73 #include "content/public/browser/site_instance.h"
72 #include "content/public/browser/web_contents.h" 74 #include "content/public/browser/web_contents.h"
73 #include "content/public/browser/web_ui.h" 75 #include "content/public/browser/web_ui.h"
(...skipping 12 matching lines...) Expand all
86 #include "extensions/common/extension.h" 88 #include "extensions/common/extension.h"
87 #include "extensions/common/extension_icon_set.h" 89 #include "extensions/common/extension_icon_set.h"
88 #include "extensions/common/extension_set.h" 90 #include "extensions/common/extension_set.h"
89 #include "extensions/common/feature_switch.h" 91 #include "extensions/common/feature_switch.h"
90 #include "extensions/common/manifest.h" 92 #include "extensions/common/manifest.h"
91 #include "extensions/common/manifest_handlers/background_info.h" 93 #include "extensions/common/manifest_handlers/background_info.h"
92 #include "extensions/common/manifest_handlers/incognito_info.h" 94 #include "extensions/common/manifest_handlers/incognito_info.h"
93 #include "extensions/common/permissions/permissions_data.h" 95 #include "extensions/common/permissions/permissions_data.h"
94 #include "extensions/common/switches.h" 96 #include "extensions/common/switches.h"
95 #include "grit/browser_resources.h" 97 #include "grit/browser_resources.h"
96 #include "grit/chromium_strings.h"
97 #include "grit/generated_resources.h"
98 #include "grit/theme_resources.h" 98 #include "grit/theme_resources.h"
99 #include "ui/base/l10n/l10n_util.h" 99 #include "ui/base/l10n/l10n_util.h"
100 100
101 using base::DictionaryValue; 101 using base::DictionaryValue;
102 using base::ListValue; 102 using base::ListValue;
103 using content::RenderViewHost; 103 using content::RenderViewHost;
104 using content::WebContents; 104 using content::WebContents;
105 105
106 namespace { 106 namespace {
107 const char kAppsDeveloperToolsExtensionId[] = 107 const char kAppsDeveloperToolsExtensionId[] =
(...skipping 1300 matching lines...) Expand 10 before | Expand all | Expand 10 after
1408 extension_service_->EnableExtension(extension_id); 1408 extension_service_->EnableExtension(extension_id);
1409 } else { 1409 } else {
1410 ExtensionErrorReporter::GetInstance()->ReportError( 1410 ExtensionErrorReporter::GetInstance()->ReportError(
1411 base::UTF8ToUTF16(JoinString(requirement_errors, ' ')), 1411 base::UTF8ToUTF16(JoinString(requirement_errors, ' ')),
1412 true); // Be noisy. 1412 true); // Be noisy.
1413 } 1413 }
1414 requirements_checker_.reset(); 1414 requirements_checker_.reset();
1415 } 1415 }
1416 1416
1417 } // namespace extensions 1417 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698