diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-06 18:11:15 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-06 18:11:15 +0000 |
| commit | 12f520c53db26ec0dc45f263904d8995e809e800 (patch) | |
| tree | defcb2b679cc43a1d0ebb85adcda4f606549883d /chrome/browser/browser.cc | |
| parent | a1ca40db95ac3c0dc8c12c42fe736c800d46c00b (diff) | |
| download | chromium_src-12f520c53db26ec0dc45f263904d8995e809e800.zip chromium_src-12f520c53db26ec0dc45f263904d8995e809e800.tar.gz chromium_src-12f520c53db26ec0dc45f263904d8995e809e800.tar.bz2 | |
Append profile info to win7 app id per issue 30414
Add profile info to app id for non-default profile so that win7 could
group chrome icons based on profile.
- Add a new chrome/common/win_util.h/cc to hold app id functions that
would include profile info for non-default profiles;
- Add unit test to the new GetChromiumAppId function;
- Browser and JumpList to use the GetChromiumAppId for BrowserWindow
and JumpList;
- UserDataManager to use it for shortcuts it creates;
- Make app id for web apps include profile info as well;
- Change web_app::UpdateShortcuts to just update shortcuts description,
icon and app id;
BUG=30414
TEST=Verify fix for issue 30414.
Review URL: http://codereview.chromium.org/506079
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35634 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
| -rw-r--r-- | chrome/browser/browser.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index 671f73f..bc72c9a 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -89,6 +89,7 @@ #include "chrome/browser/cert_store.h" #include "chrome/browser/download/save_package.h" #include "chrome/browser/ssl/ssl_error_info.h" +#include "chrome/browser/shell_integration.h" #include "chrome/browser/task_manager.h" #include "chrome/browser/user_data_manager.h" #include "chrome/browser/view_ids.h" @@ -258,9 +259,12 @@ void Browser::CreateBrowserWindow() { #if defined(OS_WIN) // Set the app user model id for this application to that of the application // name. See http://crbug.com/7028. - win_util::SetAppIdForWindow(type_ & TYPE_APP ? app_name_ : - std::wstring(chrome::kBrowserAppID), - window()->GetNativeHandle()); + win_util::SetAppIdForWindow( + type_ & TYPE_APP ? + ShellIntegration::GetAppId(app_name_.c_str(), + profile_->GetPath()) : + ShellIntegration::GetChromiumAppId(profile_->GetPath()), + window()->GetNativeHandle()); #endif NotificationService::current()->Notify( |