| 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 // This file defines functions that integrate Chrome in Windows shell. These | 5 // This file defines functions that integrate Chrome in Windows shell. These |
| 6 // functions can be used by Chrome as well as Chrome installer. All of the | 6 // functions can be used by Chrome as well as Chrome installer. All of the |
| 7 // work is done by the local functions defined in anonymous namespace in | 7 // work is done by the local functions defined in anonymous namespace in |
| 8 // this class. | 8 // this class. |
| 9 | 9 |
| 10 #include "chrome/installer/util/shell_util.h" | 10 #include "chrome/installer/util/shell_util.h" |
| (...skipping 977 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 988 | 988 |
| 989 if (properties.has_icon()) | 989 if (properties.has_icon()) |
| 990 shortcut_properties.set_icon(properties.icon, properties.icon_index); | 990 shortcut_properties.set_icon(properties.icon, properties.icon_index); |
| 991 | 991 |
| 992 if (properties.has_app_id()) | 992 if (properties.has_app_id()) |
| 993 shortcut_properties.set_app_id(properties.app_id); | 993 shortcut_properties.set_app_id(properties.app_id); |
| 994 | 994 |
| 995 if (properties.has_dual_mode()) | 995 if (properties.has_dual_mode()) |
| 996 shortcut_properties.set_dual_mode(properties.dual_mode); | 996 shortcut_properties.set_dual_mode(properties.dual_mode); |
| 997 | 997 |
| 998 if (properties.has_hotkey()) |
| 999 shortcut_properties.set_hotkey(properties.hotkey); |
| 1000 |
| 998 return shortcut_properties; | 1001 return shortcut_properties; |
| 999 } | 1002 } |
| 1000 | 1003 |
| 1001 // Cleans up an old verb (run) we used to register in | 1004 // Cleans up an old verb (run) we used to register in |
| 1002 // <root>\Software\Classes\Chrome<.suffix>\.exe\shell\run on Windows 8. | 1005 // <root>\Software\Classes\Chrome<.suffix>\.exe\shell\run on Windows 8. |
| 1003 void RemoveRunVerbOnWindows8( | 1006 void RemoveRunVerbOnWindows8( |
| 1004 BrowserDistribution* dist, | 1007 BrowserDistribution* dist, |
| 1005 const string16& chrome_exe) { | 1008 const string16& chrome_exe) { |
| 1006 if (IsChromeMetroSupported()) { | 1009 if (IsChromeMetroSupported()) { |
| 1007 bool is_per_user_install =InstallUtil::IsPerUserInstall(chrome_exe.c_str()); | 1010 bool is_per_user_install =InstallUtil::IsPerUserInstall(chrome_exe.c_str()); |
| (...skipping 1146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2154 // are any left...). | 2157 // are any left...). |
| 2155 if (free_bits >= 8 && next_byte_index < size) { | 2158 if (free_bits >= 8 && next_byte_index < size) { |
| 2156 free_bits -= 8; | 2159 free_bits -= 8; |
| 2157 bit_stream += bytes[next_byte_index++] << free_bits; | 2160 bit_stream += bytes[next_byte_index++] << free_bits; |
| 2158 } | 2161 } |
| 2159 } | 2162 } |
| 2160 | 2163 |
| 2161 DCHECK_EQ(ret.length(), encoded_length); | 2164 DCHECK_EQ(ret.length(), encoded_length); |
| 2162 return ret; | 2165 return ret; |
| 2163 } | 2166 } |
| OLD | NEW |