diff options
| author | finnur@google.com <finnur@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-18 22:31:17 +0000 |
|---|---|---|
| committer | finnur@google.com <finnur@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-18 22:31:17 +0000 |
| commit | b182ccb20dfae6a26745fcc3b7d626287f946a2a (patch) | |
| tree | c8fc349bd0807902f29f5d5d5d6246bb0fd9d1b7 /tools/channel_changer/channel_changer.rc | |
| parent | 4ef1d3c70bb9b845126a8344b33987e83ab6e0cb (diff) | |
| download | chromium_src-b182ccb20dfae6a26745fcc3b7d626287f946a2a.zip chromium_src-b182ccb20dfae6a26745fcc3b7d626287f946a2a.tar.gz chromium_src-b182ccb20dfae6a26745fcc3b7d626287f946a2a.tar.bz2 | |
Fix 5561: Support system-level install in the channel changer.
When Chrome is installed system wide, the Google Update keys reside under HKLM.
Under Vista, any writes to this key will get virtualized, unless we elevate
the channel_changer process. We don't want to elevate using a manifest, because
we don't want the UAC to pop up when the Channel Changer is used to configure a
user-level Chrome installation, so we detect at process startup whether we need
to elevate and relaunch the channel_changer process (elevated) if we need to
(before showing any UI).
Review URL: http://codereview.chromium.org/14855
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7260 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/channel_changer/channel_changer.rc')
| -rw-r--r-- | tools/channel_changer/channel_changer.rc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tools/channel_changer/channel_changer.rc b/tools/channel_changer/channel_changer.rc index 8e9bfc2..cf992c8 100644 --- a/tools/channel_changer/channel_changer.rc +++ b/tools/channel_changer/channel_changer.rc @@ -37,22 +37,22 @@ IDI_BRANCH_SWITCHER ICON "../../chrome/app/theme/google_c // Dialog // -IDD_MAIN_DIALOG DIALOGEX 0, 0, 419, 186 +IDD_MAIN_DIALOG DIALOGEX 0, 0, 414, 143 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Google Chrome Channel Switcher v1.2" +CAPTION "Google Chrome Channel Switcher v1.3" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "Update",IDOK,157,153,50,14 - PUSHBUTTON "Close",IDCANCEL,213,153,50,14 + DEFPUSHBUTTON "Update",IDOK,157,120,50,14 + PUSHBUTTON "Close",IDCANCEL,213,120,50,14 LTEXT "This label will be populated programmatically.",IDC_LABEL_MAIN,47,13,322,18 CONTROL "Stable: Official Google Chrome releases (~ quarterly updates).",IDC_STABLE, - "Button",BS_AUTORADIOBUTTON | BS_MULTILINE,45,39,340,19 + "Button",BS_AUTORADIOBUTTON | BS_MULTILINE,47,44,340,8 CONTROL "Beta: More stable releases (~ monthly updates).",IDC_BETA, - "Button",BS_AUTORADIOBUTTON | BS_MULTILINE,45,63,340,19 + "Button",BS_AUTORADIOBUTTON | BS_MULTILINE,47,59,340,8 CONTROL "Dev: The latest features and bugfixes (~ weekly updates).",IDC_CUTTING_EDGE, - "Button",BS_AUTORADIOBUTTON | BS_MULTILINE,45,90,355,21 + "Button",BS_AUTORADIOBUTTON | BS_MULTILINE,47,73,340,8 CONTROL 129,IDC_IMAGEVIEW,"Static",SS_BITMAP,7,7,35,30 - LTEXT "Note: If you switch from Dev to Beta, you'll stay on the current Chrome version until the Beta channel gets a later update. Changing channels does not change the version of Chrome you are currently using.",IDC_SECONDARY_LABEL,44,128,340,21 + LTEXT "Note: If you switch from Dev to Beta, you'll stay on the current Chrome version until the Beta channel gets a later update. Changing channels does not change the version of Chrome you are currently using.",IDC_SECONDARY_LABEL,47,95,340,21 END @@ -95,9 +95,9 @@ BEGIN IDD_MAIN_DIALOG, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 412 + RIGHTMARGIN, 407 TOPMARGIN, 7 - BOTTOMMARGIN, 179 + BOTTOMMARGIN, 136 END END #endif // APSTUDIO_INVOKED |