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

Side by Side Diff: chrome/installer/util/shell_util.cc

Issue 559253002: Installer: Do not write "URL Protocol" to the ChromeHTML registry entry. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 } 290 }
291 } 291 }
292 292
293 // File association ProgId 293 // File association ProgId
294 base::string16 chrome_html_prog_id(ShellUtil::kRegClasses); 294 base::string16 chrome_html_prog_id(ShellUtil::kRegClasses);
295 chrome_html_prog_id.push_back(base::FilePath::kSeparators[0]); 295 chrome_html_prog_id.push_back(base::FilePath::kSeparators[0]);
296 chrome_html_prog_id.append(GetBrowserProgId(suffix)); 296 chrome_html_prog_id.append(GetBrowserProgId(suffix));
297 entries->push_back(new RegistryEntry( 297 entries->push_back(new RegistryEntry(
298 chrome_html_prog_id, dist->GetBrowserProgIdDesc())); 298 chrome_html_prog_id, dist->GetBrowserProgIdDesc()));
299 entries->push_back(new RegistryEntry( 299 entries->push_back(new RegistryEntry(
300 chrome_html_prog_id, ShellUtil::kRegUrlProtocol, base::string16()));
gab 2014/09/12 11:43:15 From https://code.google.com/p/chromium/codesearch
grt (UTC plus 2) 2014/09/12 13:59:41 If http://msdn.microsoft.com/library/ie/aa767914.a
Matt Giuca 2014/09/12 23:49:24 I'll do some testing in IE on Monday. (I didn't re
grt (UTC plus 2) 2014/09/13 03:27:38 Exactly. I wonder what would happen if Chrome is r
Matt Giuca 2014/09/15 00:52:01 No, it works perfectly: 1. Go here: http://www.lo
grt (UTC plus 2) 2014/09/15 13:55:18 Awesome, thanks for confirming.
301 entries->push_back(new RegistryEntry(
302 chrome_html_prog_id + ShellUtil::kRegDefaultIcon, icon_path)); 300 chrome_html_prog_id + ShellUtil::kRegDefaultIcon, icon_path));
303 entries->push_back(new RegistryEntry( 301 entries->push_back(new RegistryEntry(
304 chrome_html_prog_id + ShellUtil::kRegShellOpen, open_cmd)); 302 chrome_html_prog_id + ShellUtil::kRegShellOpen, open_cmd));
305 if (set_delegate_execute) { 303 if (set_delegate_execute) {
306 entries->push_back(new RegistryEntry( 304 entries->push_back(new RegistryEntry(
307 chrome_html_prog_id + ShellUtil::kRegShellOpen, 305 chrome_html_prog_id + ShellUtil::kRegShellOpen,
308 ShellUtil::kRegDelegateExecute, delegate_guid)); 306 ShellUtil::kRegDelegateExecute, delegate_guid));
309 } 307 }
310 308
311 // The following entries are required as of Windows 8, but do not 309 // The following entries are required as of Windows 8, but do not
(...skipping 1975 matching lines...) Expand 10 before | Expand all | Expand 10 after
2287 // are any left...). 2285 // are any left...).
2288 if (free_bits >= 8 && next_byte_index < size) { 2286 if (free_bits >= 8 && next_byte_index < size) {
2289 free_bits -= 8; 2287 free_bits -= 8;
2290 bit_stream += bytes[next_byte_index++] << free_bits; 2288 bit_stream += bytes[next_byte_index++] << free_bits;
2291 } 2289 }
2292 } 2290 }
2293 2291
2294 DCHECK_EQ(ret.length(), encoded_length); 2292 DCHECK_EQ(ret.length(), encoded_length);
2295 return ret; 2293 return ret;
2296 } 2294 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698