summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-17 14:35:02 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-17 14:35:02 +0000
commitab4b95dd02b93633763fad49bd53f730a40a3c72 (patch)
tree76275be454919e1ba6ecdaa2f4fe25592fa39a8b /chrome/browser
parent5996b8277ee21d131c256c5fc5cdf33275e42d3e (diff)
downloadchromium_src-ab4b95dd02b93633763fad49bd53f730a40a3c72.zip
chromium_src-ab4b95dd02b93633763fad49bd53f730a40a3c72.tar.gz
chromium_src-ab4b95dd02b93633763fad49bd53f730a40a3c72.tar.bz2
views: Rename content_setting_bubble_views.[cc/h] to content_setting_bubble_contents.[cc/h]
(Note: that was a TODO for bulach). BUG=None TEST=trybots Review URL: http://codereview.chromium.org/3177016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56343 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/views/content_setting_bubble_contents.cc (renamed from chrome/browser/views/content_setting_bubble_views.cc)2
-rw-r--r--chrome/browser/views/content_setting_bubble_contents.h (renamed from chrome/browser/views/content_setting_bubble_views.h)7
-rw-r--r--chrome/browser/views/location_bar/content_setting_image_view.cc2
3 files changed, 5 insertions, 6 deletions
diff --git a/chrome/browser/views/content_setting_bubble_views.cc b/chrome/browser/views/content_setting_bubble_contents.cc
index f0f541e..d8e3303 100644
--- a/chrome/browser/views/content_setting_bubble_views.cc
+++ b/chrome/browser/views/content_setting_bubble_contents.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/views/content_setting_bubble_views.h"
+#include "chrome/browser/views/content_setting_bubble_contents.h"
#if defined(OS_LINUX)
#include <gdk/gdk.h>
diff --git a/chrome/browser/views/content_setting_bubble_views.h b/chrome/browser/views/content_setting_bubble_contents.h
index 7def5ba..f0b9119 100644
--- a/chrome/browser/views/content_setting_bubble_views.h
+++ b/chrome/browser/views/content_setting_bubble_contents.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_VIEWS_CONTENT_SETTING_BUBBLE_VIEWS_H_
-#define CHROME_BROWSER_VIEWS_CONTENT_SETTING_BUBBLE_VIEWS_H_
+#ifndef CHROME_BROWSER_VIEWS_CONTENT_SETTING_BUBBLE_CONTENTS_H_
+#define CHROME_BROWSER_VIEWS_CONTENT_SETTING_BUBBLE_CONTENTS_H_
#pragma once
#include <map>
@@ -33,7 +33,6 @@ class NativeButton;
class RadioButton;
}
-// TODO(bulach): rename this file.
class ContentSettingBubbleContents : public views::View,
public views::ButtonListener,
public views::LinkController,
@@ -99,4 +98,4 @@ class ContentSettingBubbleContents : public views::View,
DISALLOW_IMPLICIT_CONSTRUCTORS(ContentSettingBubbleContents);
};
-#endif // CHROME_BROWSER_VIEWS_CONTENT_SETTING_BUBBLE_VIEWS_H_
+#endif // CHROME_BROWSER_VIEWS_CONTENT_SETTING_BUBBLE_CONTENTS_H_
diff --git a/chrome/browser/views/location_bar/content_setting_image_view.cc b/chrome/browser/views/location_bar/content_setting_image_view.cc
index 8404e34..baeed23b 100644
--- a/chrome/browser/views/location_bar/content_setting_image_view.cc
+++ b/chrome/browser/views/location_bar/content_setting_image_view.cc
@@ -9,7 +9,7 @@
#include "chrome/browser/content_setting_bubble_model.h"
#include "chrome/browser/content_setting_image_model.h"
#include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/views/content_setting_bubble_views.h"
+#include "chrome/browser/views/content_setting_bubble_contents.h"
#include "chrome/browser/views/location_bar/location_bar_view.h"
ContentSettingImageView::ContentSettingImageView(