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

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

Issue 355233002: Fix build when ENABLE_MANAGED_USERS is not defined (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address jhawkins Comments 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
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_restore_service.h" 8 #include "apps/app_restore_service.h"
9 #include "apps/app_window.h" 9 #include "apps/app_window.h"
10 #include "apps/app_window_registry.h" 10 #include "apps/app_window_registry.h"
(...skipping 26 matching lines...) Expand all
37 #include "chrome/browser/extensions/extension_service.h" 37 #include "chrome/browser/extensions/extension_service.h"
38 #include "chrome/browser/extensions/extension_tab_util.h" 38 #include "chrome/browser/extensions/extension_tab_util.h"
39 #include "chrome/browser/extensions/extension_ui_util.h" 39 #include "chrome/browser/extensions/extension_ui_util.h"
40 #include "chrome/browser/extensions/extension_util.h" 40 #include "chrome/browser/extensions/extension_util.h"
41 #include "chrome/browser/extensions/extension_warning_set.h" 41 #include "chrome/browser/extensions/extension_warning_set.h"
42 #include "chrome/browser/extensions/install_verifier.h" 42 #include "chrome/browser/extensions/install_verifier.h"
43 #include "chrome/browser/extensions/path_util.h" 43 #include "chrome/browser/extensions/path_util.h"
44 #include "chrome/browser/extensions/updater/extension_updater.h" 44 #include "chrome/browser/extensions/updater/extension_updater.h"
45 #include "chrome/browser/platform_util.h" 45 #include "chrome/browser/platform_util.h"
46 #include "chrome/browser/profiles/profile.h" 46 #include "chrome/browser/profiles/profile.h"
47 #include "chrome/browser/supervised_user/supervised_user_service.h"
48 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
49 #include "chrome/browser/tab_contents/background_contents.h" 47 #include "chrome/browser/tab_contents/background_contents.h"
50 #include "chrome/browser/ui/browser_finder.h" 48 #include "chrome/browser/ui/browser_finder.h"
51 #include "chrome/browser/ui/extensions/application_launch.h" 49 #include "chrome/browser/ui/extensions/application_launch.h"
52 #include "chrome/browser/ui/webui/extensions/extension_basic_info.h" 50 #include "chrome/browser/ui/webui/extensions/extension_basic_info.h"
53 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" 51 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
54 #include "chrome/common/chrome_switches.h" 52 #include "chrome/common/chrome_switches.h"
55 #include "chrome/common/chrome_version_info.h" 53 #include "chrome/common/chrome_version_info.h"
56 #include "chrome/common/extensions/extension_constants.h" 54 #include "chrome/common/extensions/extension_constants.h"
57 #include "chrome/common/extensions/features/feature_channel.h" 55 #include "chrome/common/extensions/features/feature_channel.h"
58 #include "chrome/common/extensions/manifest_url_handler.h" 56 #include "chrome/common/extensions/manifest_url_handler.h"
(...skipping 28 matching lines...) Expand all
87 #include "extensions/common/manifest_handlers/background_info.h" 85 #include "extensions/common/manifest_handlers/background_info.h"
88 #include "extensions/common/manifest_handlers/incognito_info.h" 86 #include "extensions/common/manifest_handlers/incognito_info.h"
89 #include "extensions/common/permissions/permissions_data.h" 87 #include "extensions/common/permissions/permissions_data.h"
90 #include "grit/browser_resources.h" 88 #include "grit/browser_resources.h"
91 #include "grit/chromium_strings.h" 89 #include "grit/chromium_strings.h"
92 #include "grit/generated_resources.h" 90 #include "grit/generated_resources.h"
93 #include "grit/theme_resources.h" 91 #include "grit/theme_resources.h"
94 #include "ui/base/l10n/l10n_util.h" 92 #include "ui/base/l10n/l10n_util.h"
95 #include "ui/base/resource/resource_bundle.h" 93 #include "ui/base/resource/resource_bundle.h"
96 94
95 #if defined(ENABLE_MANAGED_USERS)
96 #include "chrome/browser/supervised_user/supervised_user_service.h"
James Hawkins 2014/09/02 22:11:01 How are these includes used in this file?
mckev 2014/09/03 20:20:18 Good question. It appears that they aren't used a
97 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
98 #endif
99
97 using base::DictionaryValue; 100 using base::DictionaryValue;
98 using base::ListValue; 101 using base::ListValue;
99 using content::RenderViewHost; 102 using content::RenderViewHost;
100 using content::WebContents; 103 using content::WebContents;
101 104
102 namespace { 105 namespace {
103 const char kAppsDeveloperToolsExtensionId[] = 106 const char kAppsDeveloperToolsExtensionId[] =
104 "ohmmkhmmmpcnpikjeljgnaoabkaalbgc"; 107 "ohmmkhmmmpcnpikjeljgnaoabkaalbgc";
105 } 108 }
106 109
(...skipping 1259 matching lines...) Expand 10 before | Expand all | Expand 10 after
1366 extension_service_->EnableExtension(extension_id); 1369 extension_service_->EnableExtension(extension_id);
1367 } else { 1370 } else {
1368 ExtensionErrorReporter::GetInstance()->ReportError( 1371 ExtensionErrorReporter::GetInstance()->ReportError(
1369 base::UTF8ToUTF16(JoinString(requirement_errors, ' ')), 1372 base::UTF8ToUTF16(JoinString(requirement_errors, ' ')),
1370 true); // Be noisy. 1373 true); // Be noisy.
1371 } 1374 }
1372 requirements_checker_.reset(); 1375 requirements_checker_.reset();
1373 } 1376 }
1374 1377
1375 } // namespace extensions 1378 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698