| OLD | NEW |
| 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 511 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 522 IDR_HELP_MANIFEST)); | 522 IDR_HELP_MANIFEST)); |
| 523 } | 523 } |
| 524 #endif | 524 #endif |
| 525 #endif | 525 #endif |
| 526 | 526 |
| 527 // Web Store. | 527 // Web Store. |
| 528 component_extensions.push_back(std::make_pair( | 528 component_extensions.push_back(std::make_pair( |
| 529 FILE_PATH_LITERAL("web_store"), | 529 FILE_PATH_LITERAL("web_store"), |
| 530 IDR_WEBSTORE_MANIFEST)); | 530 IDR_WEBSTORE_MANIFEST)); |
| 531 | 531 |
| 532 component_extensions.push_back(std::make_pair( |
| 533 FILE_PATH_LITERAL("cloud_print"), |
| 534 IDR_CLOUDPRINT_MANIFEST)); |
| 535 |
| 532 for (ComponentExtensionList::iterator iter = component_extensions.begin(); | 536 for (ComponentExtensionList::iterator iter = component_extensions.begin(); |
| 533 iter != component_extensions.end(); ++iter) { | 537 iter != component_extensions.end(); ++iter) { |
| 534 FilePath path(iter->first); | 538 FilePath path(iter->first); |
| 535 if (!path.IsAbsolute()) { | 539 if (!path.IsAbsolute()) { |
| 536 if (PathService::Get(chrome::DIR_RESOURCES, &path)) { | 540 if (PathService::Get(chrome::DIR_RESOURCES, &path)) { |
| 537 path = path.Append(iter->first); | 541 path = path.Append(iter->first); |
| 538 } else { | 542 } else { |
| 539 NOTREACHED(); | 543 NOTREACHED(); |
| 540 } | 544 } |
| 541 } | 545 } |
| (...skipping 1093 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1635 if (!prerender::PrerenderManager::IsPrerenderingPossible()) | 1639 if (!prerender::PrerenderManager::IsPrerenderingPossible()) |
| 1636 return NULL; | 1640 return NULL; |
| 1637 if (!prerender_manager_.get()) { | 1641 if (!prerender_manager_.get()) { |
| 1638 CHECK(g_browser_process->prerender_tracker()); | 1642 CHECK(g_browser_process->prerender_tracker()); |
| 1639 prerender_manager_.reset( | 1643 prerender_manager_.reset( |
| 1640 new prerender::PrerenderManager( | 1644 new prerender::PrerenderManager( |
| 1641 this, g_browser_process->prerender_tracker())); | 1645 this, g_browser_process->prerender_tracker())); |
| 1642 } | 1646 } |
| 1643 return prerender_manager_.get(); | 1647 return prerender_manager_.get(); |
| 1644 } | 1648 } |
| OLD | NEW |