diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-26 21:58:30 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-26 21:58:30 +0000 |
| commit | f191d1bd7601d9be5aea71b1890a85d6e16707dc (patch) | |
| tree | 056a543f914025cc15104089f1a05b1d56fd8986 | |
| parent | 3229c19c6370ca99bf838b7e08a844226d693f02 (diff) | |
| download | chromium_src-f191d1bd7601d9be5aea71b1890a85d6e16707dc.zip chromium_src-f191d1bd7601d9be5aea71b1890a85d6e16707dc.tar.gz chromium_src-f191d1bd7601d9be5aea71b1890a85d6e16707dc.tar.bz2 | |
Remove the last bits leftover from my frame window experiment.
Review URL: http://codereview.chromium.org/113863
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16930 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/browser.h | 2 | ||||
| -rw-r--r-- | chrome/browser/browser_init.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/views/frame/browser_frame_win.cc | 9 |
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: |