diff options
| author | ian@chromium.org <ian@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-10 19:45:29 +0000 |
|---|---|---|
| committer | ian@chromium.org <ian@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-10 19:45:29 +0000 |
| commit | 25cbe2b831886e21a6425ab43b5f77e7f5625a38 (patch) | |
| tree | 63965e5aca03d50e4f126875a01c2d0593bc933a /chrome/tools | |
| parent | 02fdc003c7fcecac964c5c855f733a899459f533 (diff) | |
| download | chromium_src-25cbe2b831886e21a6425ab43b5f77e7f5625a38.zip chromium_src-25cbe2b831886e21a6425ab43b5f77e7f5625a38.tar.gz chromium_src-25cbe2b831886e21a6425ab43b5f77e7f5625a38.tar.bz2 | |
Merging issue 2067023 for bryner@google.com
BUG=none
TEST=safe_browsing_blocking_page_unittest.cc
Review URL: http://codereview.chromium.org/2737005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49437 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/tools')
| -rw-r--r-- | chrome/tools/chromeactions.txt | 16 | ||||
| -rwxr-xr-x | chrome/tools/extract_actions.py | 12 |
2 files changed, 25 insertions, 3 deletions
diff --git a/chrome/tools/chromeactions.txt b/chrome/tools/chromeactions.txt index f205801..e00955f 100644 --- a/chrome/tools/chromeactions.txt +++ b/chrome/tools/chromeactions.txt @@ -251,6 +251,8 @@ 0x576b4b3570828783 MostVisited7 0x7e2c4d68af709827 MostVisited8 0x1b40c6b1b5dd7106 MostVisited9 +0x9c6a4ef293d946ca MostVisited_BlacklistCleared +0xa90e38146e0a4399 MostVisited_UrlRemoved 0xf812385dfcc1a683 MoveBackward 0xd5980f1362f718dd MoveBackwardAndModifySelection 0x8c95fa949833ae3c MoveDown @@ -357,6 +359,8 @@ 0x1747b98bb0705d52 Options_Startup_LastSession 0x24301fc721f3f091 Options_TLS1_Disable 0x1c669fc919a6eccb Options_TLS1_Enable +0x0e213ca8fa03d268 Options_TabsToLinks_Disable +0x60adcbc1d31d59a2 Options_TabsToLinks_Enable 0x01c2684695fc839e Options_TapToClickCheckbox_Disable 0x6f37e83ce98b3082 Options_TapToClickCheckbox_Enable 0x73defd4825af2700 Options_ThemesGallery @@ -389,6 +393,15 @@ 0xbcc54eb67cab2ae9 RemoveFormat 0xa728f2892204aabc ReportBug 0x8f83bd601e845bc1 RestoreTab +0x665cc78aff3f37f5 SBInterstitialMalwareDontProceed +0xf02ed35cab0dcf4b SBInterstitialMalwareProceed +0x09af23846e454261 SBInterstitialMalwareShow +0xc81645e63b16cb44 SBInterstitialMultipleDontProceed +0x866cc35d2bcdf71d SBInterstitialMultipleProceed +0x6dbe9571062fcfde SBInterstitialMultipleShow +0x60578de80374e115 SBInterstitialPhishingDontProceed +0x340331e81b86f933 SBInterstitialPhishingProceed +0xf8af4ff865669301 SBInterstitialPhishingShow 0xc9cc8cce247e49ba Save 0xfc7723f7c10f79d5 SavePage 0x702bbdc91c8e399d SelectAll @@ -420,6 +433,8 @@ 0x658963e1a47a5018 ShowOptions 0x564171f658dcb78e ShowPageMenu 0xecf70e5f5be34681 ShowRecentlyViewed +0xfd243b004d004e00 ShowSections_RecentSitesDisabled +0x3b86156dcf560cdb ShowSections_RecentSitesEnabled 0x5118181c3ece5e84 ShowSessions 0x26f93e6e68e28a69 Star 0x11a755d598c0c417 Stop @@ -438,6 +453,7 @@ 0xdcc35326aa8a5aeb TabContextMenu_TogglePinned 0xdd2b0058433af670 TabContextMenu_UseDestinationsTab_Off 0xe5f9f328f5d86b51 TabContextMenu_UseDestinationsTab_On +0x3fe88a1365e8dc47 TabContextMenu_UseVerticalTabs 0xb5ffa70ecb67b6f3 TabOverview_DetachCell 0x060f1f68f262b152 TabOverview_DragCell 0xad9c26360444768c TabOverview_DragOverMiniWindow diff --git a/chrome/tools/extract_actions.py b/chrome/tools/extract_actions.py index 1caa022..6b448d6 100755 --- a/chrome/tools/extract_actions.py +++ b/chrome/tools/extract_actions.py @@ -35,14 +35,15 @@ from google import path_utils # they require special handling code in this script. # To add a new file, add it to this list and add the appropriate logic to # generate the known actions to AddComputedActions() below. -KNOWN_COMPUTED_USERS = [ +KNOWN_COMPUTED_USERS = ( 'back_forward_menu_model.cc', 'options_page_view.cc', 'render_view_host.cc', # called using webkit identifiers 'user_metrics.cc', # method definition 'new_tab_ui.cc', # most visited clicks 1-9 'extension_metrics_module.cc', # extensions hook for user metrics -] + 'safe_browsing_blocking_page.cc', # various interstitial types and actions +) number_of_files_total = 0 @@ -55,7 +56,7 @@ def AddComputedActions(actions): """ # Actions for back_forward_menu_model.cc. - for dir in ['BackMenu_', 'ForwardMenu_']: + for dir in ('BackMenu_', 'ForwardMenu_'): actions.add(dir + 'ShowFullHistory') actions.add(dir + 'Popup') for i in range(1, 20): @@ -66,6 +67,11 @@ def AddComputedActions(actions): for i in range(1, 10): actions.add('MostVisited%d' % i) + # Actions for safe_browsing_blocking_page.cc. + for interstitial in ('Phishing', 'Malware', 'Multiple'): + for action in ('Show', 'Proceed', 'DontProceed'): + actions.add('SBInterstitial%s%s' % (interstitial, action)) + def AddWebKitEditorActions(actions): """Add editor actions from editor_client_impl.cc. |