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 551 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
562 IDR_HELP_MANIFEST)); | 562 IDR_HELP_MANIFEST)); |
563 } | 563 } |
564 #endif | 564 #endif |
565 #endif | 565 #endif |
566 | 566 |
567 // Web Store. | 567 // Web Store. |
568 component_extensions.push_back(std::make_pair( | 568 component_extensions.push_back(std::make_pair( |
569 FILE_PATH_LITERAL("web_store"), | 569 FILE_PATH_LITERAL("web_store"), |
570 IDR_WEBSTORE_MANIFEST)); | 570 IDR_WEBSTORE_MANIFEST)); |
571 | 571 |
| 572 #if !defined(OS_CHROMEOS) |
| 573 // Cloud Print component app. Not required on Chrome OS. |
572 component_extensions.push_back(std::make_pair( | 574 component_extensions.push_back(std::make_pair( |
573 FILE_PATH_LITERAL("cloud_print"), | 575 FILE_PATH_LITERAL("cloud_print"), |
574 IDR_CLOUDPRINT_MANIFEST)); | 576 IDR_CLOUDPRINT_MANIFEST)); |
| 577 #endif // !defined(OS_CHROMEOS) |
575 | 578 |
576 for (ComponentExtensionList::iterator iter = component_extensions.begin(); | 579 for (ComponentExtensionList::iterator iter = component_extensions.begin(); |
577 iter != component_extensions.end(); ++iter) { | 580 iter != component_extensions.end(); ++iter) { |
578 FilePath path(iter->first); | 581 FilePath path(iter->first); |
579 if (!path.IsAbsolute()) { | 582 if (!path.IsAbsolute()) { |
580 if (PathService::Get(chrome::DIR_RESOURCES, &path)) { | 583 if (PathService::Get(chrome::DIR_RESOURCES, &path)) { |
581 path = path.Append(iter->first); | 584 path = path.Append(iter->first); |
582 } else { | 585 } else { |
583 NOTREACHED(); | 586 NOTREACHED(); |
584 } | 587 } |
(...skipping 1132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1717 if (!prerender::PrerenderManager::IsPrerenderingPossible()) | 1720 if (!prerender::PrerenderManager::IsPrerenderingPossible()) |
1718 return NULL; | 1721 return NULL; |
1719 if (!prerender_manager_.get()) { | 1722 if (!prerender_manager_.get()) { |
1720 CHECK(g_browser_process->prerender_tracker()); | 1723 CHECK(g_browser_process->prerender_tracker()); |
1721 prerender_manager_.reset( | 1724 prerender_manager_.reset( |
1722 new prerender::PrerenderManager( | 1725 new prerender::PrerenderManager( |
1723 this, g_browser_process->prerender_tracker())); | 1726 this, g_browser_process->prerender_tracker())); |
1724 } | 1727 } |
1725 return prerender_manager_.get(); | 1728 return prerender_manager_.get(); |
1726 } | 1729 } |
OLD | NEW |