| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/profile.h" | 5 #include "chrome/browser/profile.h" |
| 6 | 6 |
| 7 #include "app/resource_bundle.h" | 7 #include "app/resource_bundle.h" |
| 8 #include "app/theme_provider.h" | 8 #include "app/theme_provider.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/env_var.h" | 10 #include "base/env_var.h" |
| (...skipping 736 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 747 #if defined(OS_CHROMEOS) && defined(GOOGLE_CHROME_BUILD) | 747 #if defined(OS_CHROMEOS) && defined(GOOGLE_CHROME_BUILD) |
| 748 // Chat manager. | 748 // Chat manager. |
| 749 if (CommandLine::ForCurrentProcess()->HasSwitch( | 749 if (CommandLine::ForCurrentProcess()->HasSwitch( |
| 750 switches::kEnableChatManager)) { | 750 switches::kEnableChatManager)) { |
| 751 component_extensions["chat_manager"] = IDR_CHAT_MANAGER_MANIFEST; | 751 component_extensions["chat_manager"] = IDR_CHAT_MANAGER_MANIFEST; |
| 752 } | 752 } |
| 753 #endif | 753 #endif |
| 754 | 754 |
| 755 // Some sample apps to make our lives easier while we are developing extension | 755 // Some sample apps to make our lives easier while we are developing extension |
| 756 // apps. This way we don't have to constantly install these over and over. | 756 // apps. This way we don't have to constantly install these over and over. |
| 757 if (CommandLine::ForCurrentProcess()->HasSwitch( | 757 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableApps)) { |
| 758 switches::kEnableExtensionApps)) { | |
| 759 #if defined(OS_WIN) | 758 #if defined(OS_WIN) |
| 760 std::string user_domain; | 759 std::string user_domain; |
| 761 if (base::EnvVarGetter::Create()->GetEnv("USERDOMAIN", &user_domain) && | 760 if (base::EnvVarGetter::Create()->GetEnv("USERDOMAIN", &user_domain) && |
| 762 user_domain == "GOOGLE") { | 761 user_domain == "GOOGLE") { |
| 763 component_extensions["gmail_app"] = IDR_GMAIL_APP_MANIFEST; | 762 component_extensions["gmail_app"] = IDR_GMAIL_APP_MANIFEST; |
| 764 component_extensions["calendar_app"] = IDR_CALENDAR_APP_MANIFEST; | 763 component_extensions["calendar_app"] = IDR_CALENDAR_APP_MANIFEST; |
| 765 component_extensions["docs_app"] = IDR_DOCS_APP_MANIFEST; | 764 component_extensions["docs_app"] = IDR_DOCS_APP_MANIFEST; |
| 766 } | 765 } |
| 767 #endif | 766 #endif |
| 768 } | 767 } |
| (...skipping 732 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1501 CommandLine::ForCurrentProcess())); | 1500 CommandLine::ForCurrentProcess())); |
| 1502 sync_service_.reset( | 1501 sync_service_.reset( |
| 1503 profile_sync_factory_->CreateProfileSyncService()); | 1502 profile_sync_factory_->CreateProfileSyncService()); |
| 1504 sync_service_->Initialize(); | 1503 sync_service_->Initialize(); |
| 1505 } | 1504 } |
| 1506 | 1505 |
| 1507 void ProfileImpl::InitCloudPrintProxyService() { | 1506 void ProfileImpl::InitCloudPrintProxyService() { |
| 1508 cloud_print_proxy_service_.reset(new CloudPrintProxyService(this)); | 1507 cloud_print_proxy_service_.reset(new CloudPrintProxyService(this)); |
| 1509 cloud_print_proxy_service_->Initialize(); | 1508 cloud_print_proxy_service_->Initialize(); |
| 1510 } | 1509 } |
| OLD | NEW |