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

Side by Side Diff: chrome/utility/chrome_content_utility_client.cc

Issue 11968032: Move 'theme' parsing out of Extension class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed IncognitoAutofillManagerTest unittest Created 7 years, 10 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 | « chrome/test/base/testing_profile.cc ('k') | no next file » | 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/utility/chrome_content_utility_client.h" 5 #include "chrome/utility/chrome_content_utility_client.h"
6 6
7 #include "base/base64.h" 7 #include "base/base64.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
11 #include "base/json/json_reader.h" 11 #include "base/json/json_reader.h"
12 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
13 #include "base/message_loop_proxy.h" 13 #include "base/message_loop_proxy.h"
14 #include "base/threading/thread.h" 14 #include "base/threading/thread.h"
15 #include "chrome/browser/importer/importer.h" 15 #include "chrome/browser/importer/importer.h"
16 #include "chrome/browser/importer/profile_import_process_messages.h" 16 #include "chrome/browser/importer/profile_import_process_messages.h"
17 #include "chrome/common/child_process_logging.h" 17 #include "chrome/common/child_process_logging.h"
18 #include "chrome/common/chrome_paths.h" 18 #include "chrome/common/chrome_paths.h"
19 #include "chrome/common/chrome_utility_messages.h" 19 #include "chrome/common/chrome_utility_messages.h"
20 #include "chrome/common/extensions/api/extension_action/browser_action_handler.h " 20 #include "chrome/common/extensions/api/extension_action/browser_action_handler.h "
21 #include "chrome/common/extensions/api/i18n/default_locale_handler.h" 21 #include "chrome/common/extensions/api/i18n/default_locale_handler.h"
22 #include "chrome/common/extensions/api/themes/theme_handler.h"
22 #include "chrome/common/extensions/extension.h" 23 #include "chrome/common/extensions/extension.h"
23 #include "chrome/common/extensions/extension_l10n_util.h" 24 #include "chrome/common/extensions/extension_l10n_util.h"
24 #include "chrome/common/extensions/extension_manifest_constants.h" 25 #include "chrome/common/extensions/extension_manifest_constants.h"
25 #include "chrome/common/extensions/manifest.h" 26 #include "chrome/common/extensions/manifest.h"
26 #include "chrome/common/extensions/manifest_handler.h" 27 #include "chrome/common/extensions/manifest_handler.h"
27 #include "chrome/common/extensions/unpacker.h" 28 #include "chrome/common/extensions/unpacker.h"
28 #include "chrome/common/extensions/update_manifest.h" 29 #include "chrome/common/extensions/update_manifest.h"
29 #include "chrome/common/web_resource/web_resource_unpacker.h" 30 #include "chrome/common/web_resource/web_resource_unpacker.h"
30 #include "chrome/common/zip.h" 31 #include "chrome/common/zip.h"
31 #include "chrome/utility/profile_import_handler.h" 32 #include "chrome/utility/profile_import_handler.h"
(...skipping 18 matching lines...) Expand all
50 namespace { 51 namespace {
51 52
52 // Explicitly register all ManifestHandlers needed in the utility process. 53 // Explicitly register all ManifestHandlers needed in the utility process.
53 void RegisterExtensionManifestHandlers() { 54 void RegisterExtensionManifestHandlers() {
54 extensions::ManifestHandler::Register( 55 extensions::ManifestHandler::Register(
55 extension_manifest_keys::kBrowserAction, 56 extension_manifest_keys::kBrowserAction,
56 make_linked_ptr(new extensions::BrowserActionHandler)); 57 make_linked_ptr(new extensions::BrowserActionHandler));
57 extensions::ManifestHandler::Register( 58 extensions::ManifestHandler::Register(
58 extension_manifest_keys::kDefaultLocale, 59 extension_manifest_keys::kDefaultLocale,
59 make_linked_ptr(new extensions::DefaultLocaleHandler)); 60 make_linked_ptr(new extensions::DefaultLocaleHandler));
61 extensions::ManifestHandler::Register(
62 extension_manifest_keys::kTheme,
63 make_linked_ptr(new extensions::ThemeHandler));
60 } 64 }
61 65
62 } // namespace 66 } // namespace
63 67
64 namespace chrome { 68 namespace chrome {
65 69
66 ChromeContentUtilityClient::ChromeContentUtilityClient() { 70 ChromeContentUtilityClient::ChromeContentUtilityClient() {
67 #if !defined(OS_ANDROID) 71 #if !defined(OS_ANDROID)
68 import_handler_.reset(new ProfileImportHandler()); 72 import_handler_.reset(new ProfileImportHandler());
69 #endif 73 #endif
(...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 } else 466 } else
463 #endif 467 #endif
464 { 468 {
465 Send(new ChromeUtilityHostMsg_GetPrinterCapsAndDefaults_Failed( 469 Send(new ChromeUtilityHostMsg_GetPrinterCapsAndDefaults_Failed(
466 printer_name)); 470 printer_name));
467 } 471 }
468 content::UtilityThread::Get()->ReleaseProcessIfNeeded(); 472 content::UtilityThread::Get()->ReleaseProcessIfNeeded();
469 } 473 }
470 474
471 } // namespace chrome 475 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/test/base/testing_profile.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698