| Index: chrome/browser/shell_integration.h
|
| diff --git a/chrome/browser/shell_integration.h b/chrome/browser/shell_integration.h
|
| index d06e0bee117ea767b32ec6946fe2416732721193..205fdf97904367e69936338460c411cdc9eeda31 100644
|
| --- a/chrome/browser/shell_integration.h
|
| +++ b/chrome/browser/shell_integration.h
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -126,12 +126,12 @@ class ShellIntegration {
|
| // Generates Win7 app id for given app name and profile path. The returned app
|
| // id is in the format of "|app_name|[.<profile_id>]". "profile_id" is
|
| // appended when user override the default value.
|
| - static std::wstring GetAppId(const std::wstring& app_name,
|
| - const FilePath& profile_path);
|
| + static string16 GetAppId(const string16& app_name,
|
| + const FilePath& profile_path);
|
|
|
| // Generates Win7 app id for Chromium by calling GetAppId with
|
| // chrome::kBrowserAppID as app_name.
|
| - static std::wstring GetChromiumAppId(const FilePath& profile_path);
|
| + static string16 GetChromiumAppId(const FilePath& profile_path);
|
|
|
| // Returns the path to the Chromium icon. This is used to specify the icon
|
| // to use for the taskbar group on Win 7.
|
|
|