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

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

Issue 7554021: Exposed test hooks for replacing GAIA auth extension. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 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 541 matching lines...) Expand 10 before | Expand all | Expand 10 after
552 component_extensions.push_back(std::make_pair( 552 component_extensions.push_back(std::make_pair(
553 FILE_PATH_LITERAL("keyboard"), 553 FILE_PATH_LITERAL("keyboard"),
554 IDR_KEYBOARD_MANIFEST)); 554 IDR_KEYBOARD_MANIFEST));
555 #endif 555 #endif
556 556
557 #if defined(OS_CHROMEOS) 557 #if defined(OS_CHROMEOS)
558 component_extensions.push_back(std::make_pair( 558 component_extensions.push_back(std::make_pair(
559 FILE_PATH_LITERAL("/usr/share/chromeos-assets/mobile"), 559 FILE_PATH_LITERAL("/usr/share/chromeos-assets/mobile"),
560 IDR_MOBILE_MANIFEST)); 560 IDR_MOBILE_MANIFEST));
561 561
562 #ifndef NDEBUG
563 if (command_line->HasSwitch(switches::kAuthExtensionPath)) { 562 if (command_line->HasSwitch(switches::kAuthExtensionPath)) {
564 FilePath auth_extension_path = 563 FilePath auth_extension_path =
565 command_line->GetSwitchValuePath(switches::kAuthExtensionPath); 564 command_line->GetSwitchValuePath(switches::kAuthExtensionPath);
566 component_extensions.push_back(std::make_pair( 565 component_extensions.push_back(std::make_pair(
567 auth_extension_path.value(), 566 auth_extension_path.value(),
568 IDR_GAIA_AUTH_MANIFEST)); 567 IDR_GAIA_TEST_AUTH_MANIFEST));
569 } else { 568 } else {
570 component_extensions.push_back(std::make_pair( 569 component_extensions.push_back(std::make_pair(
571 FILE_PATH_LITERAL("/usr/share/chromeos-assets/gaia_auth"), 570 FILE_PATH_LITERAL("/usr/share/chromeos-assets/gaia_auth"),
572 IDR_GAIA_AUTH_MANIFEST)); 571 IDR_GAIA_AUTH_MANIFEST));
573 } 572 }
574 #else
575 component_extensions.push_back(std::make_pair(
576 FILE_PATH_LITERAL("/usr/share/chromeos-assets/gaia_auth"),
577 IDR_GAIA_AUTH_MANIFEST));
578 #endif
579 573
580 #if defined(OFFICIAL_BUILD) 574 #if defined(OFFICIAL_BUILD)
581 if (browser_defaults::enable_help_app) { 575 if (browser_defaults::enable_help_app) {
582 component_extensions.push_back(std::make_pair( 576 component_extensions.push_back(std::make_pair(
583 FILE_PATH_LITERAL("/usr/share/chromeos-assets/helpapp"), 577 FILE_PATH_LITERAL("/usr/share/chromeos-assets/helpapp"),
584 IDR_HELP_MANIFEST)); 578 IDR_HELP_MANIFEST));
585 } 579 }
586 #endif 580 #endif
587 #endif 581 #endif
588 582
(...skipping 1161 matching lines...) Expand 10 before | Expand all | Expand 10 after
1750 new prerender::PrerenderManager( 1744 new prerender::PrerenderManager(
1751 this, g_browser_process->prerender_tracker())); 1745 this, g_browser_process->prerender_tracker()));
1752 #if defined(OS_CHROMEOS) 1746 #if defined(OS_CHROMEOS)
1753 prerender_manager_->AddCondition( 1747 prerender_manager_->AddCondition(
1754 new chromeos::PrerenderConditionNetwork( 1748 new chromeos::PrerenderConditionNetwork(
1755 chromeos::CrosLibrary::Get()->GetNetworkLibrary())); 1749 chromeos::CrosLibrary::Get()->GetNetworkLibrary()));
1756 #endif 1750 #endif
1757 } 1751 }
1758 return prerender_manager_.get(); 1752 return prerender_manager_.get();
1759 } 1753 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_resources.grd ('k') | chrome/browser/resources/gaia_auth/manifest_test.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698