diff options
| author | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-14 20:56:01 +0000 |
|---|---|---|
| committer | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-14 20:56:01 +0000 |
| commit | 2bf5f415ac56938fa2b99417b21ce0c75476d3f4 (patch) | |
| tree | 2f32792d3fe9ea6f4a5b003c073e68e8d8ab2c2a /chrome | |
| parent | 61e512816c5510a234f0e5dd21d7556f207cc4cd (diff) | |
| download | chromium_src-2bf5f415ac56938fa2b99417b21ce0c75476d3f4.zip chromium_src-2bf5f415ac56938fa2b99417b21ce0c75476d3f4.tar.gz chromium_src-2bf5f415ac56938fa2b99417b21ce0c75476d3f4.tar.bz2 | |
Implement a ReadyPromptContent that displays a prompt to accept, temporarily decline, or permanently decline ready mode. Implement a RegistryReadyModeState that manages the state (based on user's decision) in the registry. Interfaces to integrate those with the installer.
BUG=None
TEST=chrome_frame_unittests --gtest_filter='Ready*'
Review URL: http://codereview.chromium.org/5747002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69175 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/cf_resources.rc | 11 | ||||
| -rw-r--r-- | chrome/app/generated_resources.grd | 11 |
2 files changed, 21 insertions, 1 deletions
diff --git a/chrome/app/cf_resources.rc b/chrome/app/cf_resources.rc index 865ba9e..11e4c21 100644 --- a/chrome/app/cf_resources.rc +++ b/chrome/app/cf_resources.rc @@ -35,3 +35,14 @@ BEGIN CONTROL "&Up",IDC_DIRECTION_UP,"Button",BS_AUTORADIOBUTTON,155,34,38,10 LTEXT "Fi&nd what:",IDC_STATIC,6,7,35,8 END + +IDD_CHROME_FRAME_READY_PROMPT DIALOGEX 0, 0, 446, 22 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_BORDER +FONT 8, "MS Shell Dlg", 400, 0, 0x0 +BEGIN + LTEXT "This site recommends the Google Chrome Frame add-on for Internet Explorer. Would you like to enable it now? No download or browser restart is required.",IDC_PROMPT_MESSAGE,34,3,254,16 + ICON IDI_CHROME_FRAME_ICON,IDC_PROMPT_ICON,7,1,21,20 + DEFPUSHBUTTON "&Yes",IDACTIVATE,287,4,50,14 + PUSHBUTTON "Remind me &Later",IDLATER,340,4,66,14 + PUSHBUTTON "&No",IDNEVER,409,4,34,14 +END
\ No newline at end of file diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index fd07316..110f36b 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -11309,10 +11309,19 @@ Keep your key file in a safe place. You will need it to create new versions of y </message> </messages> - + <includes> + <if expr="pp_ifdef('_google_chrome')"> + <include name="IDI_CHROME_FRAME_ICON" file="theme\google_chrome\chrome.ico" type="ICON" /> + </if> + <if expr="not pp_ifdef('_google_chrome')"> + <include name="IDI_CHROME_FRAME_ICON" file="theme\chromium\chromium.ico" type="ICON" /> + </if> + </includes> <structures fallback_to_english="true"> <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type="dialog" > </structure> + <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" type="dialog" > + </structure> </structures> </release> |