diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-05 21:42:17 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-05 21:42:17 +0000 |
| commit | f689738887b0f2be6174bd03726ac738a2cffa01 (patch) | |
| tree | b31ce90ff74047dcf72d96e60ea428e4d81c4133 /chrome | |
| parent | b534997d1ff9b241dd207598c42ea705c110dc11 (diff) | |
| download | chromium_src-f689738887b0f2be6174bd03726ac738a2cffa01.zip chromium_src-f689738887b0f2be6174bd03726ac738a2cffa01.tar.gz chromium_src-f689738887b0f2be6174bd03726ac738a2cffa01.tar.bz2 | |
Change the name of chrome\browser\views\blocked_popup_container.{cc,h}
to blocked_popup_container_view.{cc,h}, to avoid duplication
with the same-named files in chrome\browser.
BUG=none
TEST=successful build
Review URL: http://codereview.chromium.org/119253
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17775 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/browser_prefs.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/views/blocked_popup_container_view.cc (renamed from chrome/browser/views/blocked_popup_container.cc) | 2 | ||||
| -rw-r--r-- | chrome/browser/views/blocked_popup_container_view.h (renamed from chrome/browser/views/blocked_popup_container.h) | 4 | ||||
| -rw-r--r-- | chrome/browser/views/browser_views.vcproj | 4 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc index bfca089..d208a3f 100644 --- a/chrome/browser/browser_prefs.cc +++ b/chrome/browser/browser_prefs.cc @@ -25,7 +25,7 @@ #if defined(OS_WIN) // TODO(port): whittle this down as we port #include "chrome/browser/task_manager.h" -#include "chrome/browser/views/blocked_popup_container.h" +#include "chrome/browser/views/blocked_popup_container_view.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/keyword_editor_view.h" #include "chrome/browser/views/page_info_window.h" diff --git a/chrome/browser/views/blocked_popup_container.cc b/chrome/browser/views/blocked_popup_container_view.cc index 38fa3a5..edb7c7e 100644 --- a/chrome/browser/views/blocked_popup_container.cc +++ b/chrome/browser/views/blocked_popup_container_view.cc @@ -8,7 +8,7 @@ // isn't a strict Model/View separation), and BlockedPopupContainerView // presents the user interface controls, creates and manages the popup menu. -#include "chrome/browser/views/blocked_popup_container.h" +#include "chrome/browser/views/blocked_popup_container_view.h" #include <math.h> #include <windows.h> diff --git a/chrome/browser/views/blocked_popup_container.h b/chrome/browser/views/blocked_popup_container_view.h index 74d3504..50042d5 100644 --- a/chrome/browser/views/blocked_popup_container.h +++ b/chrome/browser/views/blocked_popup_container_view.h @@ -2,8 +2,8 @@ // source code is governed by a BSD-style license that can be found in the // LICENSE file. -#ifndef CHROME_BROWSER_VIEWS_BLOCKED_POPUP_CONTAINER_H_ -#define CHROME_BROWSER_VIEWS_BLOCKED_POPUP_CONTAINER_H_ +#ifndef CHROME_BROWSER_VIEWS_BLOCKED_POPUP_CONTAINER_VIEW_H_ +#define CHROME_BROWSER_VIEWS_BLOCKED_POPUP_CONTAINER_VIEW_H_ #include <set> #include <utility> diff --git a/chrome/browser/views/browser_views.vcproj b/chrome/browser/views/browser_views.vcproj index d7aa394..b2ddb8b 100644 --- a/chrome/browser/views/browser_views.vcproj +++ b/chrome/browser/views/browser_views.vcproj @@ -460,11 +460,11 @@ > </File> <File - RelativePath=".\blocked_popup_container.cc" + RelativePath=".\blocked_popup_container_view.cc" > </File> <File - RelativePath=".\blocked_popup_container.h" + RelativePath=".\blocked_popup_container_view.h" > </File> <File diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index ba506db..9834560 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1373,8 +1373,8 @@ 'browser/views/autocomplete/autocomplete_popup_contents_view.h', 'browser/views/autocomplete/autocomplete_popup_win.cc', 'browser/views/autocomplete/autocomplete_popup_win.h', - 'browser/views/blocked_popup_container.cc', - 'browser/views/blocked_popup_container.h', + 'browser/views/blocked_popup_container_view.cc', + 'browser/views/blocked_popup_container_view.h', 'browser/views/bookmark_bar_view.cc', 'browser/views/bookmark_bar_view.h', 'browser/views/bookmark_bubble_view.cc', |