| 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 489 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 500 component_extensions.push_back(std::make_pair( | 500 component_extensions.push_back(std::make_pair( |
| 501 FILE_PATH_LITERAL("/usr/share/chromeos-assets/mobile"), | 501 FILE_PATH_LITERAL("/usr/share/chromeos-assets/mobile"), |
| 502 IDR_MOBILE_MANIFEST)); | 502 IDR_MOBILE_MANIFEST)); |
| 503 | 503 |
| 504 #if defined(OFFICIAL_BUILD) | 504 #if defined(OFFICIAL_BUILD) |
| 505 if (browser_defaults::enable_help_app) { | 505 if (browser_defaults::enable_help_app) { |
| 506 component_extensions.push_back(std::make_pair( | 506 component_extensions.push_back(std::make_pair( |
| 507 FILE_PATH_LITERAL("/usr/share/chromeos-assets/helpapp"), | 507 FILE_PATH_LITERAL("/usr/share/chromeos-assets/helpapp"), |
| 508 IDR_HELP_MANIFEST)); | 508 IDR_HELP_MANIFEST)); |
| 509 } | 509 } |
| 510 | |
| 511 component_extensions.push_back(std::make_pair( | |
| 512 FILE_PATH_LITERAL("/usr/share/chromeos-assets/getstarted"), | |
| 513 IDR_GETSTARTED_MANIFEST)); | |
| 514 #endif | 510 #endif |
| 515 } | 511 } |
| 516 #endif | 512 #endif |
| 517 | 513 |
| 518 // Web Store. | 514 // Web Store. |
| 519 component_extensions.push_back(std::make_pair( | 515 component_extensions.push_back(std::make_pair( |
| 520 FILE_PATH_LITERAL("web_store"), | 516 FILE_PATH_LITERAL("web_store"), |
| 521 IDR_WEBSTORE_MANIFEST)); | 517 IDR_WEBSTORE_MANIFEST)); |
| 522 | 518 |
| 523 for (ComponentExtensionList::iterator iter = component_extensions.begin(); | 519 for (ComponentExtensionList::iterator iter = component_extensions.begin(); |
| (...skipping 1023 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1547 return pref_proxy_config_tracker_; | 1543 return pref_proxy_config_tracker_; |
| 1548 } | 1544 } |
| 1549 | 1545 |
| 1550 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() { | 1546 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() { |
| 1551 if (!prerender::PrerenderManager::IsPrerenderingPossible()) | 1547 if (!prerender::PrerenderManager::IsPrerenderingPossible()) |
| 1552 return NULL; | 1548 return NULL; |
| 1553 if (!prerender_manager_.get()) | 1549 if (!prerender_manager_.get()) |
| 1554 prerender_manager_.reset(new prerender::PrerenderManager(this)); | 1550 prerender_manager_.reset(new prerender::PrerenderManager(this)); |
| 1555 return prerender_manager_.get(); | 1551 return prerender_manager_.get(); |
| 1556 } | 1552 } |
| OLD | NEW |