Fix the include guards in tab_contents/* for the new location.

Review URL: http://codereview.chromium.org/18160

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8194 0039d316-1c4b-4281-b951-d872f2087c98

23 files changed, 71 insertions, 71 deletions

diff --git a/chrome/browser/tab_contents/about_internets_status_view.h b/chrome/browser/tab_contents/about_internets_status_view.h
index 5d7498e..1d77a8d 100644
--- a/chrome/browser/tab_contents/about_internets_status_view.h
+++ b/chrome/browser/tab_contents/about_internets_status_view.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_ABOUT_INTERNETS_STATUS_VIEW_H__
-#define CHROME_BROWSER_ABOUT_INTERNETS_STATUS_VIEW_H__
+#ifndef CHROME_BROWSER_TAB_CONTENTS_ABOUT_INTERNETS_STATUS_VIEW_H_
+#define CHROME_BROWSER_TAB_CONTENTS_ABOUT_INTERNETS_STATUS_VIEW_H_
 
 #include "base/scoped_handle.h"
 #include "chrome/browser/tab_contents/status_view.h"
@@ -41,5 +41,5 @@ class AboutInternetsStatusView : public StatusView {
   DISALLOW_EVIL_CONSTRUCTORS(AboutInternetsStatusView);
 };
 
-#endif  // CHROME_BROWSER_ABOUT_INTERNETS_STATUS_VIEW_H__
+#endif  // CHROME_BROWSER_TAB_CONTENTS_ABOUT_INTERNETS_STATUS_VIEW_H_
 
diff --git a/chrome/browser/tab_contents/constrained_window.h b/chrome/browser/tab_contents/constrained_window.h
index d703ad2..d26087c 100644
--- a/chrome/browser/tab_contents/constrained_window.h
+++ b/chrome/browser/tab_contents/constrained_window.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_CONSTRAINED_WINDOW_H__
-#define CHROME_BROWSER_CONSTRAINED_WINDOW_H__
+#ifndef CHROME_BROWSER_TAB_CONTENTS_CONSTRAINED_WINDOW_H_
+#define CHROME_BROWSER_TAB_CONTENTS_CONSTRAINED_WINDOW_H_
 
 #include "chrome/common/page_transition_types.h"
 #include "webkit/glue/window_open_disposition.h"
@@ -65,4 +65,4 @@ class ConstrainedWindow {
   virtual const gfx::Rect& GetCurrentBounds() const = 0;
 };
 
-#endif  // #ifndef CHROME_BROWSER_CONSTRAINED_WINDOW_H__
+#endif  // #ifndef CHROME_TAB_CONTENTS_BROWSER_CONSTRAINED_WINDOW_H_
diff --git a/chrome/browser/tab_contents/infobar_delegate.h b/chrome/browser/tab_contents/infobar_delegate.h
index 07f225b..b1932d4 100644
--- a/chrome/browser/tab_contents/infobar_delegate.h
+++ b/chrome/browser/tab_contents/infobar_delegate.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_INFOBAR_DELEGATE_H_
-#define CHROME_BROWSER_INFOBAR_DELEGATE_H_
+#ifndef CHROME_BROWSER_TAB_CONTENTS_INFOBAR_DELEGATE_H_
+#define CHROME_BROWSER_TAB_CONTENTS_INFOBAR_DELEGATE_H_
 
 #include <string>
 
@@ -203,4 +203,4 @@ class SimpleAlertInfoBarDelegate : public AlertInfoBarDelegate {
   DISALLOW_COPY_AND_ASSIGN(SimpleAlertInfoBarDelegate);
 };
 
-#endif  // #ifndef CHROME_BROWSER_INFOBAR_DELEGATE_H_
+#endif  // #ifndef CHROME_BROWSER_TAB_CONTENTS_INFOBAR_DELEGATE_H_
diff --git a/chrome/browser/tab_contents/interstitial_page.h b/chrome/browser/tab_contents/interstitial_page.h
index 6c2c76f5..e740fea 100644
--- a/chrome/browser/tab_contents/interstitial_page.h
+++ b/chrome/browser/tab_contents/interstitial_page.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_INTERSTITIAL_PAGE_H_
-#define CHROME_BROWSER_INTERSTITIAL_PAGE_H_
+#ifndef CHROME_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_
+#define CHROME_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_
 
 #include <string>
 
@@ -164,5 +164,5 @@ class InterstitialPage : public NotificationObserver,
   DISALLOW_COPY_AND_ASSIGN(InterstitialPage);
 };
 
-#endif  // #ifndef CHROME_BROWSER_INTERSTITIAL_PAGE_H_
+#endif  // #ifndef CHROME_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_
  
diff --git a/chrome/browser/tab_contents/ipc_status_view.h b/chrome/browser/tab_contents/ipc_status_view.h
index 790516d..d0f28b1 100644
--- a/chrome/browser/tab_contents/ipc_status_view.h
+++ b/chrome/browser/tab_contents/ipc_status_view.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_IPC_STATUS_VIEW_H__
-#define CHROME_BROWSER_IPC_STATUS_VIEW_H__
+#ifndef CHROME_BROWSER_TAB_CONTENTS_IPC_STATUS_VIEW_H_
+#define CHROME_BROWSER_TAB_CONTENTS_IPC_STATUS_VIEW_H_
 
 #include <set>
 
@@ -80,10 +80,10 @@ class IPCStatusView : public StatusView,
   HWND settings_dialog_;
   std::set<int> disabled_messages_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(IPCStatusView);
+  DISALLOW_COPY_AND_ASSIGN(IPCStatusView);
 };
 
 #endif // IPC_MESSAGE_LOG_ENABLED
 
-#endif  // #ifndef CHROME_BROWSER_IPC_STATUS_VIEW_H__
+#endif  // #ifndef CHROME_BROWSER_TAB_CONTENTS_IPC_STATUS_VIEW_H_
 
diff --git a/chrome/browser/tab_contents/native_ui_contents.h b/chrome/browser/tab_contents/native_ui_contents.h
index decf123..9f93357 100644
--- a/chrome/browser/tab_contents/native_ui_contents.h
+++ b/chrome/browser/tab_contents/native_ui_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_NATIVE_UI_CONTENTS_H__
-#define CHROME_BROWSER_NATIVE_UI_CONTENTS_H__
+#ifndef CHROME_BROWSER_TAB_CONTENTS_NATIVE_UI_CONTENTS_H_
+#define CHROME_BROWSER_TAB_CONTENTS_NATIVE_UI_CONTENTS_H_
 
 #include "chrome/browser/page_state.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
@@ -291,5 +291,5 @@ class SearchableUIContainer : public views::View,
   DISALLOW_EVIL_CONSTRUCTORS(SearchableUIContainer);
 };
 
-#endif  // CHROME_BROWSER_NATIVE_UI_CONTENTS_H__
+#endif  // CHROME_BROWSER_TAB_CONTENTS_NATIVE_UI_CONTENTS_H_
 
diff --git a/chrome/browser/tab_contents/navigation_controller.h b/chrome/browser/tab_contents/navigation_controller.h
index 113041d..14cf5b0 100644
--- a/chrome/browser/tab_contents/navigation_controller.h
+++ b/chrome/browser/tab_contents/navigation_controller.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_NAVIGATION_CONTROLLER_H_
-#define CHROME_BROWSER_NAVIGATION_CONTROLLER_H_
+#ifndef CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_CONTROLLER_H_
+#define CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_CONTROLLER_H_
 
 #include <map>
 
@@ -547,4 +547,4 @@ class NavigationController {
   DISALLOW_COPY_AND_ASSIGN(NavigationController);
 };
 
-#endif  // CHROME_BROWSER_NAVIGATION_CONTROLLER_H_
+#endif  // CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_CONTROLLER_H_
diff --git a/chrome/browser/tab_contents/network_status_view.h b/chrome/browser/tab_contents/network_status_view.h
index 5d6f53a9..b98a25a 100644
--- a/chrome/browser/tab_contents/network_status_view.h
+++ b/chrome/browser/tab_contents/network_status_view.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_NETWORK_STATUS_VIEW_H__
-#define CHROME_BROWSER_NETWORK_STATUS_VIEW_H__
+#ifndef CHROME_BROWSER_TAB_CONTENTS_NETWORK_STATUS_VIEW_H_
+#define CHROME_BROWSER_TAB_CONTENTS_NETWORK_STATUS_VIEW_H_
 
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
@@ -113,5 +113,5 @@ class NetworkStatusView : public StatusView {
   DISALLOW_COPY_AND_ASSIGN(NetworkStatusView);
 };
 
-#endif  // #ifndef CHROME_BROWSER_NETWORK_STATUS_VIEW_H__
+#endif  // #ifndef CHROME_BROWSER_TAB_CONTENTS_NETWORK_STATUS_VIEW_H_
 
diff --git a/chrome/browser/tab_contents/page_navigator.h b/chrome/browser/tab_contents/page_navigator.h
index 0152d39..2a3ce59 100644
--- a/chrome/browser/tab_contents/page_navigator.h
+++ b/chrome/browser/tab_contents/page_navigator.h
@@ -6,8 +6,8 @@
 // intention to navigate to a particular URL.  The implementing class should
 // perform the navigation.
 
-#ifndef CHROME_BROWSER_PAGE_NAVIGATOR_H__
-#define CHROME_BROWSER_PAGE_NAVIGATOR_H__
+#ifndef CHROME_BROWSER_TAB_CONTENTS_PAGE_NAVIGATOR_H_
+#define CHROME_BROWSER_TAB_CONTENTS_PAGE_NAVIGATOR_H_
 
 #include "chrome/common/page_transition_types.h"
 #include "webkit/glue/window_open_disposition.h"
@@ -23,5 +23,5 @@ class PageNavigator {
                        PageTransition::Type transition) = 0;
 };
 
-#endif  // CHROME_BROWSER_PAGE_NAVIGATOR_H__
+#endif  // CHROME_BROWSER_TAB_CONTENTS_PAGE_NAVIGATOR_H_
 
diff --git a/chrome/browser/tab_contents/provisional_load_details.h b/chrome/browser/tab_contents/provisional_load_details.h
index 5cb9501..dc445d8 100644
--- a/chrome/browser/tab_contents/provisional_load_details.h
+++ b/chrome/browser/tab_contents/provisional_load_details.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_PROVISIONAL_LOAD_DETAILS_H_
-#define CHROME_BROWSER_PROVISIONAL_LOAD_DETAILS_H_
+#ifndef CHROME_BROWSER_TAB_CONTENTS_PROVISIONAL_LOAD_DETAILS_H_
+#define CHROME_BROWSER_TAB_CONTENTS_PROVISIONAL_LOAD_DETAILS_H_
 
 #include "base/basictypes.h"
 #include "googleurl/src/gurl.h"
@@ -56,5 +56,5 @@ class ProvisionalLoadDetails {
   DISALLOW_COPY_AND_ASSIGN(ProvisionalLoadDetails);
 };
 
-#endif  // CHROME_BROWSER_PROVISIONAL_LOAD_DETAILS_H_
+#endif  // CHROME_BROWSER_TAB_CONTENTS_PROVISIONAL_LOAD_DETAILS_H_
 
diff --git a/chrome/browser/tab_contents/site_instance.h b/chrome/browser/tab_contents/site_instance.h
index b0aa3ed..da2f98a 100644
--- a/chrome/browser/tab_contents/site_instance.h
+++ b/chrome/browser/tab_contents/site_instance.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_SITE_INSTANCE_H_
-#define CHROME_BROWSER_SITE_INSTANCE_H_
+#ifndef CHROME_BROWSER_TAB_CONTENTS_SITE_INSTANCE_H_
+#define CHROME_BROWSER_TAB_CONTENTS_SITE_INSTANCE_H_
 
 #include "chrome/browser/browsing_instance.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
@@ -152,4 +152,4 @@ class SiteInstance : public base::RefCounted<SiteInstance> {
   DISALLOW_EVIL_CONSTRUCTORS(SiteInstance);
 };
 
-#endif  // CHROME_BROWSER_SITE_INSTANCE_H_
+#endif  // CHROME_BROWSER_TAB_CONTENTS_SITE_INSTANCE_H_
diff --git a/chrome/browser/tab_contents/status_view.h b/chrome/browser/tab_contents/status_view.h
index e1f0204..88d1b91 100644
--- a/chrome/browser/tab_contents/status_view.h
+++ b/chrome/browser/tab_contents/status_view.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_STATUS_VIEW_H__
-#define CHROME_BROWSER_STATUS_VIEW_H__
+#ifndef CHROME_BROWSER_TAB_CONTENTS_STATUS_VIEW_H_
+#define CHROME_BROWSER_TAB_CONTENTS_STATUS_VIEW_H_
 
 #include <atlbase.h>
 #include <atlapp.h>
@@ -80,5 +80,5 @@ class StatusView : public TabContents,
   DISALLOW_EVIL_CONSTRUCTORS(StatusView);
 };
 
-#endif  // #ifndef CHROME_BROWSER_STATUS_VIEW_H__
+#endif  // #ifndef CHROME_BROWSER_TAB_CONTENTS_STATUS_VIEW_H_
 
diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h
index 41ef34a..cf365b3 100644
--- a/chrome/browser/tab_contents/tab_contents.h
+++ b/chrome/browser/tab_contents/tab_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_TAB_CONTENTS_H_
-#define CHROME_BROWSER_TAB_CONTENTS_H_
+#ifndef CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
+#define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
 
 #include <string>
 #include <vector>
@@ -557,4 +557,4 @@ class TabContents : public PageNavigator,
   DISALLOW_COPY_AND_ASSIGN(TabContents);
 };
 
-#endif  // CHROME_BROWSER_TAB_CONTENTS_H_
+#endif  // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
diff --git a/chrome/browser/tab_contents/tab_contents_delegate.h b/chrome/browser/tab_contents/tab_contents_delegate.h
index 773bb41..10ea799 100644
--- a/chrome/browser/tab_contents/tab_contents_delegate.h
+++ b/chrome/browser/tab_contents/tab_contents_delegate.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_TAB_CONTENTS_DELEGATE_H_
-#define CHROME_BROWSER_TAB_CONTENTS_DELEGATE_H_
+#ifndef CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_DELEGATE_H_
+#define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_DELEGATE_H_
 
 // TODO(maruel):  Remove once UINT and HWND are replaced / typedef.
 #include <windows.h>
@@ -147,4 +147,4 @@ class TabContentsDelegate : public PageNavigator {
   virtual bool IsExternalTabContainer() const { return false; }
 };
 
-#endif  // CHROME_BROWSER_TAB_CONTENTS_DELEGATE_H_
+#endif  // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_DELEGATE_H_
diff --git a/chrome/browser/tab_contents/tab_contents_factory.h b/chrome/browser/tab_contents/tab_contents_factory.h
index 615c01d..0841aa1 100644
--- a/chrome/browser/tab_contents/tab_contents_factory.h
+++ b/chrome/browser/tab_contents/tab_contents_factory.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_TAB_CONTENTS_FACTORY_H_
-#define CHROME_BROWSER_TAB_CONTENTS_FACTORY_H_
+#ifndef CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_FACTORY_H_
+#define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_FACTORY_H_
 
 #include <string>
 #include "chrome/browser/tab_contents/tab_contents_type.h"
@@ -25,4 +25,4 @@ class TabContentsFactory {
   virtual bool CanHandleURL(const GURL& url) = 0;
 };
 
-#endif  // CHROME_BROWSER_TAB_CONTENTS_FACTORY_H_
\ No newline at end of file
+#endif  // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_FACTORY_H_
diff --git a/chrome/browser/tab_contents/tab_contents_type.h b/chrome/browser/tab_contents/tab_contents_type.h
index 86f38cc..3afda07 100644
--- a/chrome/browser/tab_contents/tab_contents_type.h
+++ b/chrome/browser/tab_contents/tab_contents_type.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_TAB_CONTENTS_TYPE_H__
-#define CHROME_BROWSER_TAB_CONTENTS_TYPE_H__
+#ifndef CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_TYPE_H__
+#define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_TYPE_H__
 
 // The different kinds of tab contents we support. This is declared outside of
 // TabContents to eliminate the circular dependency between NavigationEntry
@@ -27,5 +27,5 @@ enum TabContentsType {
   TAB_CONTENTS_NUM_TYPES
 };
 
-#endif  // CHROME_BROWSER_TAB_CONTENTS_TYPE_H__
+#endif  // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_TYPE_H__
 
diff --git a/chrome/browser/tab_contents/tab_util.h b/chrome/browser/tab_contents/tab_util.h
index 6aa96f3..5103617 100644
--- a/chrome/browser/tab_contents/tab_util.h
+++ b/chrome/browser/tab_contents/tab_util.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_TAB_UTIL_H__
-#define CHROME_BROWSER_TAB_UTIL_H__
+#ifndef CHROME_BROWSER_TAB_CONTENTS_TAB_UTIL_H_
+#define CHROME_BROWSER_TAB_CONTENTS_TAB_UTIL_H_
 
 class URLRequest;
 class WebContents;
@@ -22,5 +22,5 @@ WebContents* GetWebContentsByID(int render_process_host_id, int routing_id);
 
 }  // namespace tab_util
 
-#endif  // CHROME_BROWSER_TAB_UTIL_H__
+#endif  // CHROME_BROWSER_TAB_CONTENTS_TAB_UTIL_H_
 
diff --git a/chrome/browser/tab_contents/view_source_contents.h b/chrome/browser/tab_contents/view_source_contents.h
index baeade6..f09f14b 100644
--- a/chrome/browser/tab_contents/view_source_contents.h
+++ b/chrome/browser/tab_contents/view_source_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_VIEW_SOURCE_CONTENTS_H__
-#define CHROME_BROWSER_VIEW_SOURCE_CONTENTS_H__
+#ifndef CHROME_BROWSER_TAB_CONTENTS_VIEW_SOURCE_CONTENTS_H_
+#define CHROME_BROWSER_TAB_CONTENTS_VIEW_SOURCE_CONTENTS_H_
 
 #include "chrome/browser/tab_contents/web_contents.h"
 
@@ -23,5 +23,5 @@ class ViewSourceContents : public WebContents {
       const ViewHostMsg_FrameNavigate_Params& params) { }
 };
 
-#endif  // CHROME_BROWSER_VIEW_SOURCE_CONTENTS_H__
+#endif  // CHROME_BROWSER_TAB_CONTENTS_VIEW_SOURCE_CONTENTS_H_
 
diff --git a/chrome/browser/tab_contents/web_contents.h b/chrome/browser/tab_contents/web_contents.h
index 86ce3bf..9600a15 100644
--- a/chrome/browser/tab_contents/web_contents.h
+++ b/chrome/browser/tab_contents/web_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_WEB_CONTENTS_H_
-#define CHROME_BROWSER_WEB_CONTENTS_H_
+#ifndef CHROME_BROWSER_TAB_CONTENTS_WEB_CONTENTS_H_
+#define CHROME_BROWSER_TAB_CONTENTS_WEB_CONTENTS_H_
 
 #include "base/hash_tables.h"
 #include "chrome/browser/download/save_package.h"
@@ -573,4 +573,4 @@ class WebContents : public TabContents,
   DISALLOW_COPY_AND_ASSIGN(WebContents);
 };
 
-#endif  // CHROME_BROWSER_WEB_CONTENTS_H_
+#endif  // CHROME_BROWSER_TAB_CONTENTS_WEB_CONTENTS_H_
diff --git a/chrome/browser/tab_contents/web_contents_view.h b/chrome/browser/tab_contents/web_contents_view.h
index dc5362c..bec1064 100644
--- a/chrome/browser/tab_contents/web_contents_view.h
+++ b/chrome/browser/tab_contents/web_contents_view.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_WEB_CONTENTS_VIEW_H_
-#define CHROME_BROWSER_WEB_CONTENTS_VIEW_H_
+#ifndef CHROME_BROWSER_TAB_CONTENTS_WEB_CONTENTS_VIEW_H_
+#define CHROME_BROWSER_TAB_CONTENTS_WEB_CONTENTS_VIEW_H_
 
 #include <windows.h>
 
@@ -193,4 +193,4 @@ class WebContentsView : public RenderViewHostDelegate::View {
   DISALLOW_COPY_AND_ASSIGN(WebContentsView);
 };
 
-#endif  // CHROME_BROWSER_WEB_CONTENTS_VIEW_H_
+#endif  // CHROME_BROWSER_TAB_CONTENTS_WEB_CONTENTS_VIEW_H_
diff --git a/chrome/browser/tab_contents/web_contents_view_win.h b/chrome/browser/tab_contents/web_contents_view_win.h
index a94b601..b44809b 100644
--- a/chrome/browser/tab_contents/web_contents_view_win.h
+++ b/chrome/browser/tab_contents/web_contents_view_win.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_WEB_CONTENTS_VIEW_WIN_H_
-#define CHROME_BROWSER_WEB_CONTENTS_VIEW_WIN_H_
+#ifndef CHROME_BROWSER_TAB_CONTENTS_WEB_CONTENTS_VIEW_WIN_H_
+#define CHROME_BROWSER_TAB_CONTENTS_WEB_CONTENTS_VIEW_WIN_H_
 
 #include "base/gfx/size.h"
 #include "base/scoped_ptr.h"
@@ -125,4 +125,4 @@ class WebContentsViewWin : public WebContentsView,
   DISALLOW_COPY_AND_ASSIGN(WebContentsViewWin);
 };
 
-#endif  // CHROME_BROWSER_WEB_CONTENTS_VIEW_WIN_H_
+#endif  // CHROME_BROWSER_TAB_CONTENTS_WEB_CONTENTS_VIEW_WIN_H_
diff --git a/chrome/browser/tab_contents/web_drag_source.h b/chrome/browser/tab_contents/web_drag_source.h
index f8aa628..de9fd75 100644
--- a/chrome/browser/tab_contents/web_drag_source.h
+++ b/chrome/browser/tab_contents/web_drag_source.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_WEB_DRAG_SOURCE_H__
-#define CHROME_BROWSER_WEB_DRAG_SOURCE_H__
+#ifndef CHROME_BROWSER_TAB_CONTENTS_WEB_DRAG_SOURCE_H_
+#define CHROME_BROWSER_TAB_CONTENTS_WEB_DRAG_SOURCE_H_
 
 #include "base/base_drag_source.h"
 #include "base/basictypes.h"
@@ -42,8 +42,8 @@ class WebDragSource : public BaseDragSource {
   // initiated terminates).
   RenderViewHost* render_view_host_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(WebDragSource);
+  DISALLOW_COPY_AND_ASSIGN(WebDragSource);
 };
 
-#endif  // #ifndef CHROME_BROWSER_WEB_DRAG_SOURCE_H__
+#endif  // #ifndef CHROME_BROWSER_TAB_CONTENTS_WEB_DRAG_SOURCE_H_
 
diff --git a/chrome/browser/tab_contents/web_drop_target.h b/chrome/browser/tab_contents/web_drop_target.h
index 28f4073..aca4096 100644
--- a/chrome/browser/tab_contents/web_drop_target.h
+++ b/chrome/browser/tab_contents/web_drop_target.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_WEB_DROP_TARGET_H__
-#define CHROME_BROWSER_WEB_DROP_TARGET_H__
+#ifndef CHROME_BROWSER_TAB_CONTENTS_WEB_DROP_TARGET_H_
+#define CHROME_BROWSER_TAB_CONTENTS_WEB_DROP_TARGET_H_
 
 #include "base/base_drop_target.h"
 #include "base/scoped_ptr.h"
@@ -70,5 +70,5 @@ class WebDropTarget : public BaseDropTarget {
   DISALLOW_EVIL_CONSTRUCTORS(WebDropTarget);
 };
 
-#endif  // #ifndef CHROME_BROWSER_WEB_DROP_TARGET_H__
+#endif  // #ifndef CHROME_BROWSER_TAB_CONTENTS_WEB_DROP_TARGET_H_