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

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: Include missing browsertest .js file in chrome_tests.gypi 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 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/saved_files_service.h" 8 #include "apps/saved_files_service.h"
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/base64.h" 10 #include "base/base64.h"
(...skipping 26 matching lines...) Expand all
37 #include "chrome/browser/extensions/extension_ui_util.h" 37 #include "chrome/browser/extensions/extension_ui_util.h"
38 #include "chrome/browser/extensions/extension_util.h" 38 #include "chrome/browser/extensions/extension_util.h"
39 #include "chrome/browser/extensions/install_verifier.h" 39 #include "chrome/browser/extensions/install_verifier.h"
40 #include "chrome/browser/extensions/path_util.h" 40 #include "chrome/browser/extensions/path_util.h"
41 #include "chrome/browser/extensions/shared_module_service.h" 41 #include "chrome/browser/extensions/shared_module_service.h"
42 #include "chrome/browser/extensions/updater/extension_updater.h" 42 #include "chrome/browser/extensions/updater/extension_updater.h"
43 #include "chrome/browser/extensions/webstore_reinstaller.h" 43 #include "chrome/browser/extensions/webstore_reinstaller.h"
44 #include "chrome/browser/platform_util.h" 44 #include "chrome/browser/platform_util.h"
45 #include "chrome/browser/prefs/incognito_mode_prefs.h" 45 #include "chrome/browser/prefs/incognito_mode_prefs.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.h" 48 #include "chrome/browser/ui/browser.h"
51 #include "chrome/browser/ui/browser_finder.h" 49 #include "chrome/browser/ui/browser_finder.h"
52 #include "chrome/browser/ui/browser_window.h" 50 #include "chrome/browser/ui/browser_window.h"
53 #include "chrome/browser/ui/extensions/application_launch.h" 51 #include "chrome/browser/ui/extensions/application_launch.h"
54 #include "chrome/browser/ui/webui/extensions/extension_basic_info.h" 52 #include "chrome/browser/ui/webui/extensions/extension_basic_info.h"
55 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" 53 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
56 #include "chrome/common/chrome_switches.h" 54 #include "chrome/common/chrome_switches.h"
57 #include "chrome/common/chrome_version_info.h" 55 #include "chrome/common/chrome_version_info.h"
58 #include "chrome/common/extensions/features/feature_channel.h" 56 #include "chrome/common/extensions/features/feature_channel.h"
(...skipping 1381 matching lines...) Expand 10 before | Expand all | Expand 10 after
1440 extension_service_->EnableExtension(extension_id); 1438 extension_service_->EnableExtension(extension_id);
1441 } else { 1439 } else {
1442 ExtensionErrorReporter::GetInstance()->ReportError( 1440 ExtensionErrorReporter::GetInstance()->ReportError(
1443 base::UTF8ToUTF16(JoinString(requirement_errors, ' ')), 1441 base::UTF8ToUTF16(JoinString(requirement_errors, ' ')),
1444 true); // Be noisy. 1442 true); // Be noisy.
1445 } 1443 }
1446 requirements_checker_.reset(); 1444 requirements_checker_.reset();
1447 } 1445 }
1448 1446
1449 } // namespace extensions 1447 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698