summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-06 16:03:48 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-06 16:03:48 +0000
commitbc52461f54a6a40b74991e4bc77cd0c97e916617 (patch)
tree28846d91d3f6dd52b87f66f6fe46aed9e5117aca
parent3a39d9a5664e281aa93fae0c574ae631b3389d06 (diff)
downloadchromium_src-bc52461f54a6a40b74991e4bc77cd0c97e916617.zip
chromium_src-bc52461f54a6a40b74991e4bc77cd0c97e916617.tar.gz
chromium_src-bc52461f54a6a40b74991e4bc77cd0c97e916617.tar.bz2
Rename IDS_GEOLOCATION_EXCEPTION_DIALOG to IDS_SIMPLE_CONTENT_EXCEPTION_DIALOG
Review URL: http://codereview.chromium.org/2850044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51667 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/app/resources/locale_settings.grd4
-rw-r--r--chrome/browser/gtk/options/simple_content_exceptions_window.cc4
-rw-r--r--chrome/browser/views/options/simple_content_exceptions_view.cc4
3 files changed, 6 insertions, 6 deletions
diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/locale_settings.grd
index 1b9f745..7f4532c 100644
--- a/chrome/app/resources/locale_settings.grd
+++ b/chrome/app/resources/locale_settings.grd
@@ -650,10 +650,10 @@
<!-- The width and height of the Geolocation Settings Exceptions -->
<!-- dialog box in characters and lines (See above). -->
- <message name="IDS_GEOLOCATION_EXCEPTION_DIALOG_WIDTH_CHARS" use_name_for_id="true">
+ <message name="IDS_SIMPLE_CONTENT_EXCEPTION_DIALOG_WIDTH_CHARS" use_name_for_id="true">
90
</message>
- <message name="IDS_GEOLOCATION_EXCEPTION_DIALOG_HEIGHT_LINES" use_name_for_id="true">
+ <message name="IDS_SIMPLE_CONTENT_EXCEPTION_DIALOG_HEIGHT_LINES" use_name_for_id="true">
16
</message>
<if expr="pp_ifdef('chromeos')">
diff --git a/chrome/browser/gtk/options/simple_content_exceptions_window.cc b/chrome/browser/gtk/options/simple_content_exceptions_window.cc
index 6432613..54fe5ea 100644
--- a/chrome/browser/gtk/options/simple_content_exceptions_window.cc
+++ b/chrome/browser/gtk/options/simple_content_exceptions_window.cc
@@ -116,8 +116,8 @@ SimpleContentExceptionsWindow::SimpleContentExceptionsWindow(
UpdateButtonState();
gtk_util::ShowDialogWithLocalizedSize(dialog_,
- IDS_GEOLOCATION_EXCEPTION_DIALOG_WIDTH_CHARS,
- IDS_GEOLOCATION_EXCEPTION_DIALOG_HEIGHT_LINES,
+ IDS_SIMPLE_CONTENT_EXCEPTION_DIALOG_WIDTH_CHARS,
+ IDS_SIMPLE_CONTENT_EXCEPTION_DIALOG_HEIGHT_LINES,
true);
g_signal_connect(dialog_, "response", G_CALLBACK(gtk_widget_destroy), NULL);
diff --git a/chrome/browser/views/options/simple_content_exceptions_view.cc b/chrome/browser/views/options/simple_content_exceptions_view.cc
index 3a241d2..c23db91 100644
--- a/chrome/browser/views/options/simple_content_exceptions_view.cc
+++ b/chrome/browser/views/options/simple_content_exceptions_view.cc
@@ -82,8 +82,8 @@ void SimpleContentExceptionsView::Layout() {
gfx::Size SimpleContentExceptionsView::GetPreferredSize() {
return gfx::Size(views::Window::GetLocalizedContentsSize(
- IDS_GEOLOCATION_EXCEPTION_DIALOG_WIDTH_CHARS,
- IDS_GEOLOCATION_EXCEPTION_DIALOG_HEIGHT_LINES));
+ IDS_SIMPLE_CONTENT_EXCEPTION_DIALOG_WIDTH_CHARS,
+ IDS_SIMPLE_CONTENT_EXCEPTION_DIALOG_HEIGHT_LINES));
}
void SimpleContentExceptionsView::ViewHierarchyChanged(bool is_add,