3 files changed, 1 insertions, 18 deletions
diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h
index 6972308..9b21861 100644
--- a/chrome/browser/browser.h
+++ b/chrome/browser/browser.h
@@ -119,7 +119,7 @@ class Browser : public TabStripModelDelegate,
   const std::vector<std::wstring>& user_data_dir_profiles() const {
     return g_browser_process->user_data_dir_profiles();
   }
-#if defined(UNIT_TEST) || defined(FRAME_WINDOW)
+#if defined(UNIT_TEST)
   // Sets the BrowserWindow. This is intended for testing and generally not
   // useful outside of testing. Use CreateBrowserWindow outside of testing, or
   // the static convenience methods that create a BrowserWindow for you.
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc
index a83bf12..3e6d041 100644
--- a/chrome/browser/browser_init.cc
+++ b/chrome/browser/browser_init.cc
@@ -51,10 +51,6 @@
 #include "base/win_util.h"
 #endif
 
-#ifdef FRAME_WINDOW
-#include "frame_window/frame_window.h"
-#endif
-
 namespace {
 
 class SetAsDefaultBrowserTask : public Task {
@@ -316,10 +312,6 @@ bool LaunchBrowser(const CommandLine& command_line, Profile* profile,
                    int* return_code, BrowserInit* browser_init) {
   in_startup = process_startup;
   DCHECK(profile);
-#ifdef FRAME_WINDOW
-  FrameWindow::Show(profile);
-  return true;
-#endif
 
   // Continue with the off-the-record profile from here on if --incognito
   if (command_line.HasSwitch(switches::kIncognito))
diff --git a/chrome/browser/views/frame/browser_frame_win.cc b/chrome/browser/views/frame/browser_frame_win.cc
index d206f4f..ee80b82 100644
--- a/chrome/browser/views/frame/browser_frame_win.cc
+++ b/chrome/browser/views/frame/browser_frame_win.cc
@@ -93,15 +93,6 @@ ThemeProvider* BrowserFrameWin::GetDialogThemeProvider() const {
   return profile_->GetThemeProvider();
 }
 
-#if defined(FRAME_WINDOW)
-void BrowserFrameWin::SetBrowserNonClientFrameView(
-    BrowserNonClientFrameView* view) {
-  GetNonClientView()->SetFrameView(view);
-  // SetFrameView deletes the old browser_frame_view_.
-  browser_frame_view_ = view;
-}
-#endif
-
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserFrame, views::WidgetWin overrides: