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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 335833003: Rename "managed (mode|user)" to "supervised user" (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review comments (+ a few other cleanups) Created 6 years, 6 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/browser/ui/webui/downloads_ui_browsertest.cc ('k') | chrome/browser/ui/webui/history_ui.h » ('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) 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 24 matching lines...) Expand all
35 #include "chrome/browser/extensions/extension_disabled_ui.h" 35 #include "chrome/browser/extensions/extension_disabled_ui.h"
36 #include "chrome/browser/extensions/extension_error_reporter.h" 36 #include "chrome/browser/extensions/extension_error_reporter.h"
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/updater/extension_updater.h" 43 #include "chrome/browser/extensions/updater/extension_updater.h"
44 #include "chrome/browser/google/google_util.h" 44 #include "chrome/browser/google/google_util.h"
45 #include "chrome/browser/managed_mode/managed_user_service.h"
46 #include "chrome/browser/managed_mode/managed_user_service_factory.h"
47 #include "chrome/browser/profiles/profile.h" 45 #include "chrome/browser/profiles/profile.h"
46 #include "chrome/browser/supervised_user/supervised_user_service.h"
47 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
48 #include "chrome/browser/tab_contents/background_contents.h" 48 #include "chrome/browser/tab_contents/background_contents.h"
49 #include "chrome/browser/ui/browser_finder.h" 49 #include "chrome/browser/ui/browser_finder.h"
50 #include "chrome/browser/ui/extensions/application_launch.h" 50 #include "chrome/browser/ui/extensions/application_launch.h"
51 #include "chrome/browser/ui/webui/extensions/extension_basic_info.h" 51 #include "chrome/browser/ui/webui/extensions/extension_basic_info.h"
52 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" 52 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
53 #include "chrome/common/chrome_switches.h" 53 #include "chrome/common/chrome_switches.h"
54 #include "chrome/common/chrome_version_info.h" 54 #include "chrome/common/chrome_version_info.h"
55 #include "chrome/common/extensions/extension_constants.h" 55 #include "chrome/common/extensions/extension_constants.h"
56 #include "chrome/common/extensions/features/feature_channel.h" 56 #include "chrome/common/extensions/features/feature_channel.h"
57 #include "chrome/common/extensions/manifest_url_handler.h" 57 #include "chrome/common/extensions/manifest_url_handler.h"
(...skipping 1286 matching lines...) Expand 10 before | Expand all | Expand 10 after
1344 extension_service_->EnableExtension(extension_id); 1344 extension_service_->EnableExtension(extension_id);
1345 } else { 1345 } else {
1346 ExtensionErrorReporter::GetInstance()->ReportError( 1346 ExtensionErrorReporter::GetInstance()->ReportError(
1347 base::UTF8ToUTF16(JoinString(requirement_errors, ' ')), 1347 base::UTF8ToUTF16(JoinString(requirement_errors, ' ')),
1348 true); // Be noisy. 1348 true); // Be noisy.
1349 } 1349 }
1350 requirements_checker_.reset(); 1350 requirements_checker_.reset();
1351 } 1351 }
1352 1352
1353 } // namespace extensions 1353 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/downloads_ui_browsertest.cc ('k') | chrome/browser/ui/webui/history_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698