summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/views')
-rw-r--r--chrome/browser/views/browser_dialogs.h11
-rw-r--r--chrome/browser/views/dialog_stubs_gtk.cc8
-rw-r--r--chrome/browser/views/frame/browser_view.cc1
-rw-r--r--chrome/browser/views/page_info_window_view.cc26
4 files changed, 15 insertions, 31 deletions
diff --git a/chrome/browser/views/browser_dialogs.h b/chrome/browser/views/browser_dialogs.h
index 8806976..c2b13f3 100644
--- a/chrome/browser/views/browser_dialogs.h
+++ b/chrome/browser/views/browser_dialogs.h
@@ -6,7 +6,6 @@
#define CHROME_BROWSER_VIEWS_BROWSER_DIALOGS_H_
#include "base/gfx/native_widget_types.h"
-#include "chrome/browser/tab_contents/navigation_entry.h"
// This file contains functions for running a variety of browser dialogs and
// popups. The dialogs here are the ones that the caller does not need to
@@ -98,16 +97,6 @@ void EditSearchEngine(gfx::NativeWindow parent,
EditSearchEngineControllerDelegate* delegate,
Profile* profile);
-// Shows the page info using the specified information.
-// |url| is the url of the page/frame the info applies to, |ssl| is the SSL
-// information for that page/frame. If |show_history| is true, a section
-// showing how many times that URL has been visited is added to the page info.
-void ShowPageInfo(gfx::NativeWindow parent,
- Profile* profile,
- const GURL& url,
- const NavigationEntry::SSLStatus& ssl,
- bool show_history);
-
} // namespace browser
#endif // CHROME_BROWSER_VIEWS_BROWSER_DIALOGS_H_
diff --git a/chrome/browser/views/dialog_stubs_gtk.cc b/chrome/browser/views/dialog_stubs_gtk.cc
index 7c1b15d..3a482ee 100644
--- a/chrome/browser/views/dialog_stubs_gtk.cc
+++ b/chrome/browser/views/dialog_stubs_gtk.cc
@@ -92,14 +92,6 @@ void EditSearchEngine(gfx::NativeWindow parent,
NOTIMPLEMENTED();
}
-void ShowPageInfo(gfx::NativeView parent,
- Profile* profile,
- const GURL& url,
- const NavigationEntry::SSLStatus& ssl,
- bool show_history) {
- NOTIMPLEMENTED();
-}
-
} // namespace browser
void ShowOptionsWindow(OptionsPage page,
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index 1de6e48..d4fc97e 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -30,6 +30,7 @@
#if defined(OS_WIN)
#include "chrome/browser/jumplist.h"
#endif
+#include "chrome/browser/page_info_window.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/view_ids.h"
#include "chrome/browser/views/bookmark_bar_view.h"
diff --git a/chrome/browser/views/page_info_window_view.cc b/chrome/browser/views/page_info_window_view.cc
index 4e3b020..987552b6 100644
--- a/chrome/browser/views/page_info_window_view.cc
+++ b/chrome/browser/views/page_info_window_view.cc
@@ -13,8 +13,10 @@
#include "app/resource_bundle.h"
#include "app/l10n_util.h"
#include "base/compiler_specific.h"
+#include "base/string_util.h"
#include "chrome/browser/cert_store.h"
#include "chrome/browser/page_info_model.h"
+#include "chrome/browser/page_info_window.h"
#include "chrome/common/pref_names.h"
#include "grit/locale_settings.h"
#include "grit/generated_resources.h"
@@ -109,10 +111,10 @@ class PageInfoWindowView : public views::View,
// optional head-line (in bold) and a description.
class Section : public views::View {
public:
- Section(const std::wstring& title,
+ Section(const string16& title,
bool state,
- const std::wstring& head_line,
- const std::wstring& description);
+ const string16& head_line,
+ const string16& description);
virtual ~Section();
virtual int GetHeightForWidth(int w);
@@ -120,16 +122,16 @@ class Section : public views::View {
private:
// The text placed on top of the section (on the left of the separator bar).
- std::wstring title_;
+ string16 title_;
// Whether to show the good/bad icon.
bool state_;
// The first line of the description, show in bold.
- std::wstring head_line_;
+ string16 head_line_;
// The description, displayed below the head line.
- std::wstring description_;
+ string16 description_;
static SkBitmap* good_state_icon_;
static SkBitmap* bad_state_icon_;
@@ -361,10 +363,10 @@ void PageInfoWindowView::ShowCertDialog(int cert_id) {
////////////////////////////////////////////////////////////////////////////////
// Section
-Section::Section(const std::wstring& title,
+Section::Section(const string16& title,
bool state,
- const std::wstring& head_line,
- const std::wstring& description)
+ const string16& head_line,
+ const string16& description)
: title_(title),
state_(state),
head_line_(head_line),
@@ -374,7 +376,7 @@ Section::Section(const std::wstring& title,
good_state_icon_ = rb.GetBitmapNamed(IDR_PAGEINFO_GOOD);
bad_state_icon_ = rb.GetBitmapNamed(IDR_PAGEINFO_BAD);
}
- title_label_ = new views::Label(title);
+ title_label_ = new views::Label(UTF16ToWideHack(title));
title_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
AddChildView(title_label_);
@@ -389,13 +391,13 @@ Section::Section(const std::wstring& title,
status_image_->SetImage(state ? good_state_icon_ : bad_state_icon_);
AddChildView(status_image_);
- head_line_label_ = new views::Label(head_line);
+ head_line_label_ = new views::Label(UTF16ToWideHack(head_line));
head_line_label_->SetFont(
head_line_label_->GetFont().DeriveFont(0, gfx::Font::BOLD));
head_line_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
AddChildView(head_line_label_);
- description_label_ = new views::Label(description);
+ description_label_ = new views::Label(UTF16ToWideHack(description));
description_label_->SetMultiLine(true);
description_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
AddChildView(description_label_);
generated by cgit v1.1 at 2025-02-08 05:41:16 +0000