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

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

Issue 6930033: Replace GetStarted component extension with URL (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tolower Created 9 years, 7 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 498 matching lines...) Expand 10 before | Expand all | Expand 10 after
509 component_extensions.push_back(std::make_pair( 509 component_extensions.push_back(std::make_pair(
510 FILE_PATH_LITERAL("/usr/share/chromeos-assets/mobile"), 510 FILE_PATH_LITERAL("/usr/share/chromeos-assets/mobile"),
511 IDR_MOBILE_MANIFEST)); 511 IDR_MOBILE_MANIFEST));
512 512
513 #if defined(OFFICIAL_BUILD) 513 #if defined(OFFICIAL_BUILD)
514 if (browser_defaults::enable_help_app) { 514 if (browser_defaults::enable_help_app) {
515 component_extensions.push_back(std::make_pair( 515 component_extensions.push_back(std::make_pair(
516 FILE_PATH_LITERAL("/usr/share/chromeos-assets/helpapp"), 516 FILE_PATH_LITERAL("/usr/share/chromeos-assets/helpapp"),
517 IDR_HELP_MANIFEST)); 517 IDR_HELP_MANIFEST));
518 } 518 }
519
520 component_extensions.push_back(std::make_pair(
521 FILE_PATH_LITERAL("/usr/share/chromeos-assets/getstarted"),
522 IDR_GETSTARTED_MANIFEST));
523 #endif 519 #endif
524 } 520 }
525 #endif 521 #endif
526 522
527 // Web Store. 523 // Web Store.
528 component_extensions.push_back(std::make_pair( 524 component_extensions.push_back(std::make_pair(
529 FILE_PATH_LITERAL("web_store"), 525 FILE_PATH_LITERAL("web_store"),
530 IDR_WEBSTORE_MANIFEST)); 526 IDR_WEBSTORE_MANIFEST));
531 527
532 for (ComponentExtensionList::iterator iter = component_extensions.begin(); 528 for (ComponentExtensionList::iterator iter = component_extensions.begin();
(...skipping 1054 matching lines...) Expand 10 before | Expand all | Expand 10 after
1587 return pref_proxy_config_tracker_; 1583 return pref_proxy_config_tracker_;
1588 } 1584 }
1589 1585
1590 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() { 1586 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() {
1591 if (!prerender::PrerenderManager::IsPrerenderingPossible()) 1587 if (!prerender::PrerenderManager::IsPrerenderingPossible())
1592 return NULL; 1588 return NULL;
1593 if (!prerender_manager_.get()) 1589 if (!prerender_manager_.get())
1594 prerender_manager_.reset(new prerender::PrerenderManager(this)); 1590 prerender_manager_.reset(new prerender::PrerenderManager(this));
1595 return prerender_manager_.get(); 1591 return prerender_manager_.get();
1596 } 1592 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/existing_user_controller.cc ('k') | chrome/browser/resources/getstarted/manifest.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698