diff options
| author | pamg@google.com <pamg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-04 22:37:11 +0000 |
|---|---|---|
| committer | pamg@google.com <pamg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-04 22:37:11 +0000 |
| commit | e0e8289ce8b13eee37d4063ad505255e9555c372 (patch) | |
| tree | c63b876fdbed368d06fc024822aef19c409720d5 /chrome/browser/autocomplete | |
| parent | e432d4cbdf610a02ed7aea0bf181e4a47df5dad7 (diff) | |
| download | chromium_src-e0e8289ce8b13eee37d4063ad505255e9555c372.zip chromium_src-e0e8289ce8b13eee37d4063ad505255e9555c372.tar.gz chromium_src-e0e8289ce8b13eee37d4063ad505255e9555c372.tar.bz2 | |
Restoring r29827. The skia file is new to this attempt, and may be what was causing a unit test to crash last time.
Refactor security-icon code to a more general form, also more consistent with
the Windows implementation, in preparation for implementing page actions.
Review URL: http://codereview.chromium.org/264037
BUG=14899, 22922, 12281
TEST=unit tests included
Review URL: http://codereview.chromium.org/348069
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31023 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_edit_view_mac.h | 1 | ||||
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_edit_view_mac.mm | 12 |
2 files changed, 0 insertions, 13 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_mac.h b/chrome/browser/autocomplete/autocomplete_edit_view_mac.h index 51bb40e..f43f218 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_mac.h +++ b/chrome/browser/autocomplete/autocomplete_edit_view_mac.h @@ -96,7 +96,6 @@ class AutocompleteEditViewMac : public AutocompleteEditView, virtual bool CanPasteAndGo(); virtual int GetPasteActionStringId(); virtual void OnPasteAndGo(); - virtual void OnSecurityIconClicked(); virtual void OnFrameChanged(); // Helper functions for use from AutocompleteEditHelper Objective-C diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm index 27c25a9..0bde489 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm +++ b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm @@ -16,10 +16,8 @@ #include "chrome/browser/autocomplete/autocomplete_edit.h" #include "chrome/browser/autocomplete/autocomplete_popup_model.h" #include "chrome/browser/autocomplete/autocomplete_popup_view_mac.h" -#include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/cocoa/event_utils.h" -#include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "grit/generated_resources.h" @@ -632,16 +630,6 @@ bool AutocompleteEditViewMac::CanPasteAndGo() { model_->CanPasteAndGo(GetClipboardText(g_browser_process->clipboard())); } -void AutocompleteEditViewMac::OnSecurityIconClicked() { - TabContents* tab = BrowserList::GetLastActive()->GetSelectedTabContents(); - NavigationEntry* nav_entry = tab->controller().GetActiveEntry(); - if (!nav_entry) { - NOTREACHED(); - return; - } - tab->ShowPageInfo(nav_entry->url(), nav_entry->ssl(), true); -} - int AutocompleteEditViewMac::GetPasteActionStringId() { DCHECK(CanPasteAndGo()); |