| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/shell_integration.h" | 5 #include "chrome/browser/shell_integration.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
| 10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 #else | 105 #else |
| 106 if (!profile_path.empty()) | 106 if (!profile_path.empty()) |
| 107 command_line->AppendSwitchPath(switches::kProfileDirectory, | 107 command_line->AppendSwitchPath(switches::kProfileDirectory, |
| 108 profile_path.BaseName()); | 108 profile_path.BaseName()); |
| 109 #endif | 109 #endif |
| 110 } | 110 } |
| 111 | 111 |
| 112 #if !defined(OS_WIN) | 112 #if !defined(OS_WIN) |
| 113 | 113 |
| 114 base::string16 ShellIntegration::GetAppShortcutsSubdirName() { | 114 base::string16 ShellIntegration::GetAppShortcutsSubdirName() { |
| 115 if (chrome::VersionInfo::GetChannel() == chrome::VersionInfo::CHANNEL_CANARY) | 115 if (chrome::VersionInfo::GetChannel() == version_info::Channel::CANARY) |
| 116 return l10n_util::GetStringUTF16(IDS_APP_SHORTCUTS_SUBDIR_NAME_CANARY); | 116 return l10n_util::GetStringUTF16(IDS_APP_SHORTCUTS_SUBDIR_NAME_CANARY); |
| 117 return l10n_util::GetStringUTF16(IDS_APP_SHORTCUTS_SUBDIR_NAME); | 117 return l10n_util::GetStringUTF16(IDS_APP_SHORTCUTS_SUBDIR_NAME); |
| 118 } | 118 } |
| 119 | 119 |
| 120 // static | 120 // static |
| 121 bool ShellIntegration::SetAsDefaultBrowserInteractive() { | 121 bool ShellIntegration::SetAsDefaultBrowserInteractive() { |
| 122 return false; | 122 return false; |
| 123 } | 123 } |
| 124 | 124 |
| 125 // static | 125 // static |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 305 case ShellIntegration::SET_DEFAULT_INTERACTIVE: | 305 case ShellIntegration::SET_DEFAULT_INTERACTIVE: |
| 306 if (interactive_permitted) { | 306 if (interactive_permitted) { |
| 307 result = ShellIntegration::SetAsDefaultProtocolClientInteractive( | 307 result = ShellIntegration::SetAsDefaultProtocolClientInteractive( |
| 308 protocol_); | 308 protocol_); |
| 309 } | 309 } |
| 310 break; | 310 break; |
| 311 } | 311 } |
| 312 | 312 |
| 313 return result; | 313 return result; |
| 314 } | 314 } |
| OLD | NEW |