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

Side by Side Diff: chrome/browser/profiles/profile_impl.cc

Issue 7253001: Added a private chromeAuthPrivate API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed unittest failure Created 9 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/profiles/profile_impl.h" 5 #include "chrome/browser/profiles/profile_impl.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/environment.h" 9 #include "base/environment.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after
529 IDR_HELP_MANIFEST)); 529 IDR_HELP_MANIFEST));
530 } 530 }
531 #endif 531 #endif
532 #endif 532 #endif
533 533
534 // Web Store. 534 // Web Store.
535 component_extensions.push_back(std::make_pair( 535 component_extensions.push_back(std::make_pair(
536 FILE_PATH_LITERAL("web_store"), 536 FILE_PATH_LITERAL("web_store"),
537 IDR_WEBSTORE_MANIFEST)); 537 IDR_WEBSTORE_MANIFEST));
538 538
539 component_extensions.push_back(std::make_pair(
540 FILE_PATH_LITERAL("cloud_print"),
541 IDR_CLOUDPRINT_MANIFEST));
542
539 for (ComponentExtensionList::iterator iter = component_extensions.begin(); 543 for (ComponentExtensionList::iterator iter = component_extensions.begin();
540 iter != component_extensions.end(); ++iter) { 544 iter != component_extensions.end(); ++iter) {
541 FilePath path(iter->first); 545 FilePath path(iter->first);
542 if (!path.IsAbsolute()) { 546 if (!path.IsAbsolute()) {
543 if (PathService::Get(chrome::DIR_RESOURCES, &path)) { 547 if (PathService::Get(chrome::DIR_RESOURCES, &path)) {
544 path = path.Append(iter->first); 548 path = path.Append(iter->first);
545 } else { 549 } else {
546 NOTREACHED(); 550 NOTREACHED();
547 } 551 }
548 } 552 }
(...skipping 1102 matching lines...) Expand 10 before | Expand all | Expand 10 after
1651 if (!prerender::PrerenderManager::IsPrerenderingPossible()) 1655 if (!prerender::PrerenderManager::IsPrerenderingPossible())
1652 return NULL; 1656 return NULL;
1653 if (!prerender_manager_.get()) { 1657 if (!prerender_manager_.get()) {
1654 CHECK(g_browser_process->prerender_tracker()); 1658 CHECK(g_browser_process->prerender_tracker());
1655 prerender_manager_.reset( 1659 prerender_manager_.reset(
1656 new prerender::PrerenderManager( 1660 new prerender::PrerenderManager(
1657 this, g_browser_process->prerender_tracker())); 1661 this, g_browser_process->prerender_tracker()));
1658 } 1662 }
1659 return prerender_manager_.get(); 1663 return prerender_manager_.get();
1660 } 1664 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_function_dispatcher.cc ('k') | chrome/browser/resources/cloud_print_app/manifest.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698