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

Side by Side Diff: chrome/browser/extensions/api/developer_private/developer_private_api.cc

Issue 23923010: Move Inspect[BackgroundPage|ExtensionHost] Out of ExtensionService (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 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
« no previous file with comments | « no previous file | chrome/browser/extensions/devtools_util.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/extensions/api/developer_private/developer_private_api. h" 5 #include "chrome/browser/extensions/api/developer_private/developer_private_api. 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/saved_files_service.h" 9 #include "apps/saved_files_service.h"
10 #include "apps/shell_window.h" 10 #include "apps/shell_window.h"
11 #include "apps/shell_window_registry.h" 11 #include "apps/shell_window_registry.h"
12 #include "base/base64.h" 12 #include "base/base64.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/file_util.h" 14 #include "base/file_util.h"
15 #include "base/files/file_enumerator.h" 15 #include "base/files/file_enumerator.h"
16 #include "base/i18n/file_util_icu.h" 16 #include "base/i18n/file_util_icu.h"
17 #include "base/strings/string_number_conversions.h" 17 #include "base/strings/string_number_conversions.h"
18 #include "base/strings/utf_string_conversions.h" 18 #include "base/strings/utf_string_conversions.h"
19 #include "base/values.h" 19 #include "base/values.h"
20 #include "chrome/browser/chrome_notification_types.h" 20 #include "chrome/browser/chrome_notification_types.h"
21 #include "chrome/browser/devtools/devtools_window.h" 21 #include "chrome/browser/devtools/devtools_window.h"
22 #include "chrome/browser/extensions/api/developer_private/developer_private_api_ factory.h" 22 #include "chrome/browser/extensions/api/developer_private/developer_private_api_ factory.h"
23 #include "chrome/browser/extensions/api/developer_private/entry_picker.h" 23 #include "chrome/browser/extensions/api/developer_private/entry_picker.h"
24 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" 24 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
25 #include "chrome/browser/extensions/devtools_util.h"
25 #include "chrome/browser/extensions/extension_disabled_ui.h" 26 #include "chrome/browser/extensions/extension_disabled_ui.h"
26 #include "chrome/browser/extensions/extension_error_reporter.h" 27 #include "chrome/browser/extensions/extension_error_reporter.h"
27 #include "chrome/browser/extensions/extension_service.h" 28 #include "chrome/browser/extensions/extension_service.h"
28 #include "chrome/browser/extensions/extension_system.h" 29 #include "chrome/browser/extensions/extension_system.h"
29 #include "chrome/browser/extensions/management_policy.h" 30 #include "chrome/browser/extensions/management_policy.h"
30 #include "chrome/browser/extensions/unpacked_installer.h" 31 #include "chrome/browser/extensions/unpacked_installer.h"
31 #include "chrome/browser/extensions/updater/extension_updater.h" 32 #include "chrome/browser/extensions/updater/extension_updater.h"
32 #include "chrome/browser/platform_util.h" 33 #include "chrome/browser/platform_util.h"
33 #include "chrome/browser/profiles/profile.h" 34 #include "chrome/browser/profiles/profile.h"
34 #include "chrome/browser/sync_file_system/drive_backend/drive_file_sync_service. h" 35 #include "chrome/browser/sync_file_system/drive_backend/drive_file_sync_service. h"
(...skipping 691 matching lines...) Expand 10 before | Expand all | Expand 10 after
726 // This is a lazy background page. Identify if it is a normal 727 // This is a lazy background page. Identify if it is a normal
727 // or incognito background page. 728 // or incognito background page.
728 ExtensionService* service = profile()->GetExtensionService(); 729 ExtensionService* service = profile()->GetExtensionService();
729 if (options.incognito) 730 if (options.incognito)
730 service = ExtensionSystem::Get( 731 service = ExtensionSystem::Get(
731 service->profile()->GetOffTheRecordProfile())->extension_service(); 732 service->profile()->GetOffTheRecordProfile())->extension_service();
732 const Extension* extension = service->extensions()->GetByID( 733 const Extension* extension = service->extensions()->GetByID(
733 options.extension_id); 734 options.extension_id);
734 DCHECK(extension); 735 DCHECK(extension);
735 // Wakes up the background page and opens the inspect window. 736 // Wakes up the background page and opens the inspect window.
736 service->InspectBackgroundPage(extension); 737 devtools_util::InspectBackgroundPage(extension, profile());
737 return false; 738 return false;
738 } 739 }
739 740
740 int render_view_id; 741 int render_view_id;
741 base::StringToInt(options.render_view_id, &render_view_id); 742 base::StringToInt(options.render_view_id, &render_view_id);
742 content::RenderViewHost* host = content::RenderViewHost::FromID( 743 content::RenderViewHost* host = content::RenderViewHost::FromID(
743 render_process_id, render_view_id); 744 render_process_id, render_view_id);
744 745
745 if (!host) { 746 if (!host) {
746 // This can happen if the host has gone away since the page was displayed. 747 // This can happen if the host has gone away since the page was displayed.
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
1276 return true; 1277 return true;
1277 } 1278 }
1278 1279
1279 DeveloperPrivateIsProfileManagedFunction:: 1280 DeveloperPrivateIsProfileManagedFunction::
1280 ~DeveloperPrivateIsProfileManagedFunction() { 1281 ~DeveloperPrivateIsProfileManagedFunction() {
1281 } 1282 }
1282 1283
1283 } // namespace api 1284 } // namespace api
1284 1285
1285 } // namespace extensions 1286 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/devtools_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698