diff options
| author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-11 21:56:58 +0000 |
|---|---|---|
| committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-11 21:56:58 +0000 |
| commit | a4be1e85d6c73aea61d1c5b118d9804b1a8ca4f8 (patch) | |
| tree | 4a2dd47cf3955e32839700f04a281e5cb742653f /chrome/browser/browser.cc | |
| parent | dbcb6d7712e923327e327b6fea5acf941d444fba (diff) | |
| download | chromium_src-a4be1e85d6c73aea61d1c5b118d9804b1a8ca4f8.zip chromium_src-a4be1e85d6c73aea61d1c5b118d9804b1a8ca4f8.tar.gz chromium_src-a4be1e85d6c73aea61d1c5b118d9804b1a8ca4f8.tar.bz2 | |
Implement more of the TabContentsDelegate to hook up loading URLs from the location bar where there is UI to do so.
Review URL: http://codereview.chromium.org/21264
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9601 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
| -rw-r--r-- | chrome/browser/browser.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index af06203..a74a2ee 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -1507,8 +1507,6 @@ void Browser::TabStripEmpty() { method_factory_.NewRunnableMethod(&Browser::CloseFrame)); } -#if defined(OS_WIN) - /////////////////////////////////////////////////////////////////////////////// // Browser, TabContentsDelegate implementation: @@ -1652,6 +1650,8 @@ void Browser::ReplaceContents(TabContents* source, TabContents* new_contents) { Source<TabContents>(new_contents)); } +#if defined(OS_WIN) + void Browser::AddNewContents(TabContents* source, TabContents* new_contents, WindowOpenDisposition disposition, @@ -2310,7 +2310,6 @@ bool Browser::HasCompletedUnloadProcessing() { tabs_needing_unload_fired_.empty(); } -#if defined(OS_WIN) void Browser::CancelWindowClose() { DCHECK(is_attempting_to_close_browser_); // Only cancelling beforeunload should be able to cancel the window's close. @@ -2341,7 +2340,6 @@ void Browser::ClearUnloadState(TabContents* tab) { ProcessPendingTabs(); } -#endif // OS_WIN /////////////////////////////////////////////////////////////////////////////// // Browser, Assorted utility functions (private): |