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

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

Issue 12091115: Allow manifest handlers to declare keys they depend on that must be parsed before them. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: dcronin 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 | Annotate | Revision Log
« no previous file with comments | « chrome/renderer/chrome_content_renderer_client.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"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 #include "printing/emf_win.h" 46 #include "printing/emf_win.h"
47 #include "ui/gfx/gdi_util.h" 47 #include "ui/gfx/gdi_util.h"
48 #endif // defined(OS_WIN) 48 #endif // defined(OS_WIN)
49 49
50 namespace { 50 namespace {
51 51
52 // Explicitly register all ManifestHandlers needed in the utility process. 52 // Explicitly register all ManifestHandlers needed in the utility process.
53 void RegisterExtensionManifestHandlers() { 53 void RegisterExtensionManifestHandlers() {
54 extensions::ManifestHandler::Register( 54 extensions::ManifestHandler::Register(
55 extension_manifest_keys::kBrowserAction, 55 extension_manifest_keys::kBrowserAction,
56 new extensions::BrowserActionHandler); 56 make_linked_ptr(new extensions::BrowserActionHandler));
57 extensions::ManifestHandler::Register( 57 extensions::ManifestHandler::Register(
58 extension_manifest_keys::kDefaultLocale, 58 extension_manifest_keys::kDefaultLocale,
59 new extensions::DefaultLocaleHandler); 59 make_linked_ptr(new extensions::DefaultLocaleHandler));
60 } 60 }
61 61
62 } // namespace 62 } // namespace
63 63
64 namespace chrome { 64 namespace chrome {
65 65
66 ChromeContentUtilityClient::ChromeContentUtilityClient() { 66 ChromeContentUtilityClient::ChromeContentUtilityClient() {
67 #if !defined(OS_ANDROID) 67 #if !defined(OS_ANDROID)
68 import_handler_.reset(new ProfileImportHandler()); 68 import_handler_.reset(new ProfileImportHandler());
69 #endif 69 #endif
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after
461 } else 461 } else
462 #endif 462 #endif
463 { 463 {
464 Send(new ChromeUtilityHostMsg_GetPrinterCapsAndDefaults_Failed( 464 Send(new ChromeUtilityHostMsg_GetPrinterCapsAndDefaults_Failed(
465 printer_name)); 465 printer_name));
466 } 466 }
467 content::UtilityThread::Get()->ReleaseProcessIfNeeded(); 467 content::UtilityThread::Get()->ReleaseProcessIfNeeded();
468 } 468 }
469 469
470 } // namespace chrome 470 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/renderer/chrome_content_renderer_client.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698