Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 11:55:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Create BrowserTabViewItems using the factory method on BrowserTabView, and add an accessor for the proxy icon view.

Browse Source
This commit is contained in:
sfraser%netscape.com 2002-08-19 03:51:32 +00:00
parent 416619a0ec
commit eafd807a5b
8 changed files with 40 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
camino/BrowserWindowController.h
View File

@ -278,5 +278,8 @@ class nsIDOMNode;
// Accessor to get the sidebar drawer
- (NSDrawer *)sidebarDrawer;
// Accessor to get the proxy icon view
- (CHPageProxyIcon *)proxyIconView;
@end

11
camino/BrowserWindowController.mm
View File

@ -40,7 +40,6 @@
#import "BrowserWindowController.h"
#import "CHBrowserWrapper.h"
#import "CHIconTabViewItem.h"
#import "CHPreferenceManager.h"
#import "BookmarksDataSource.h"
#import "CHHistoryDataSource.h"
@ -968,7 +967,7 @@ static NSArray* sToolbarDefaults = nil;
-(void)newTab:(BOOL)allowHomepage
{
CHIconTabViewItem* newTab = [[[CHIconTabViewItem alloc] initWithIdentifier: nil] autorelease];
BrowserTabViewItem* newTab = [BrowserTabView makeNewTabItem];
CHBrowserWrapper* newView = [[[CHBrowserWrapper alloc] initWithTab: newTab andWindow: [mTabBrowser window]] autorelease];
PRInt32 newTabPage = 0;
@ -980,7 +979,7 @@ static NSArray* sToolbarDefaults = nil;
[newTab setLabel: ((newTabPage == 1) ? NSLocalizedString(@"TabLoading", @"") : NSLocalizedString(@"UntitledPageTitle", @""))];
[newTab setView: newView];
[mTabBrowser addTabViewItem: newTab];
// Focus the URL bar if we're opening a blank tab and the URL bar is visible.
NSToolbar* toolbar = [[self window] toolbar];
BOOL focusURLBar = ([toolbar isVisible] &&
@ -1087,7 +1086,7 @@ static NSArray* sToolbarDefaults = nil;
-(void)openNewTabWithURL: (NSString*)aURLSpec referrer:(NSString*)aReferrer loadInBackground: (BOOL)aLoadInBG
{
CHIconTabViewItem* newTab = [[[CHIconTabViewItem alloc] initWithIdentifier: nil] autorelease];
BrowserTabViewItem* newTab = [BrowserTabView makeNewTabItem];
// hyatt originally made new tabs open on the far right and tabs opened from a content
// link open to the right of the current tab. The idea was to keep the new tab
@ -1476,6 +1475,10 @@ static NSArray* sToolbarDefaults = nil;
return mSidebarDrawer;
}
- (CHPageProxyIcon *)proxyIconView
{
return mProxyIcon;
}
- (id)windowWillReturnFieldEditor:(NSWindow *)aWindow toObject:(id)anObject
{

3
camino/src/browser/BrowserWindowController.h
View File

@ -278,5 +278,8 @@ class nsIDOMNode;
// Accessor to get the sidebar drawer
- (NSDrawer *)sidebarDrawer;
// Accessor to get the proxy icon view
- (CHPageProxyIcon *)proxyIconView;
@end

11
camino/src/browser/BrowserWindowController.mm
View File

@ -40,7 +40,6 @@
#import "BrowserWindowController.h"
#import "CHBrowserWrapper.h"
#import "CHIconTabViewItem.h"
#import "CHPreferenceManager.h"
#import "BookmarksDataSource.h"
#import "CHHistoryDataSource.h"
@ -968,7 +967,7 @@ static NSArray* sToolbarDefaults = nil;
-(void)newTab:(BOOL)allowHomepage
{
CHIconTabViewItem* newTab = [[[CHIconTabViewItem alloc] initWithIdentifier: nil] autorelease];
BrowserTabViewItem* newTab = [BrowserTabView makeNewTabItem];
CHBrowserWrapper* newView = [[[CHBrowserWrapper alloc] initWithTab: newTab andWindow: [mTabBrowser window]] autorelease];
PRInt32 newTabPage = 0;
@ -980,7 +979,7 @@ static NSArray* sToolbarDefaults = nil;
[newTab setLabel: ((newTabPage == 1) ? NSLocalizedString(@"TabLoading", @"") : NSLocalizedString(@"UntitledPageTitle", @""))];
[newTab setView: newView];
[mTabBrowser addTabViewItem: newTab];
// Focus the URL bar if we're opening a blank tab and the URL bar is visible.
NSToolbar* toolbar = [[self window] toolbar];
BOOL focusURLBar = ([toolbar isVisible] &&
@ -1087,7 +1086,7 @@ static NSArray* sToolbarDefaults = nil;
-(void)openNewTabWithURL: (NSString*)aURLSpec referrer:(NSString*)aReferrer loadInBackground: (BOOL)aLoadInBG
{
CHIconTabViewItem* newTab = [[[CHIconTabViewItem alloc] initWithIdentifier: nil] autorelease];
BrowserTabViewItem* newTab = [BrowserTabView makeNewTabItem];
// hyatt originally made new tabs open on the far right and tabs opened from a content
// link open to the right of the current tab. The idea was to keep the new tab
@ -1476,6 +1475,10 @@ static NSArray* sToolbarDefaults = nil;
return mSidebarDrawer;
}
- (CHPageProxyIcon *)proxyIconView
{
return mProxyIcon;
}
- (id)windowWillReturnFieldEditor:(NSWindow *)aWindow toObject:(id)anObject
{

3
chimera/BrowserWindowController.h
View File

@ -278,5 +278,8 @@ class nsIDOMNode;
// Accessor to get the sidebar drawer
- (NSDrawer *)sidebarDrawer;
// Accessor to get the proxy icon view
- (CHPageProxyIcon *)proxyIconView;
@end

11
chimera/BrowserWindowController.mm
View File

@ -40,7 +40,6 @@
#import "BrowserWindowController.h"
#import "CHBrowserWrapper.h"
#import "CHIconTabViewItem.h"
#import "CHPreferenceManager.h"
#import "BookmarksDataSource.h"
#import "CHHistoryDataSource.h"
@ -968,7 +967,7 @@ static NSArray* sToolbarDefaults = nil;
-(void)newTab:(BOOL)allowHomepage
{
CHIconTabViewItem* newTab = [[[CHIconTabViewItem alloc] initWithIdentifier: nil] autorelease];
BrowserTabViewItem* newTab = [BrowserTabView makeNewTabItem];
CHBrowserWrapper* newView = [[[CHBrowserWrapper alloc] initWithTab: newTab andWindow: [mTabBrowser window]] autorelease];
PRInt32 newTabPage = 0;
@ -980,7 +979,7 @@ static NSArray* sToolbarDefaults = nil;
[newTab setLabel: ((newTabPage == 1) ? NSLocalizedString(@"TabLoading", @"") : NSLocalizedString(@"UntitledPageTitle", @""))];
[newTab setView: newView];
[mTabBrowser addTabViewItem: newTab];
// Focus the URL bar if we're opening a blank tab and the URL bar is visible.
NSToolbar* toolbar = [[self window] toolbar];
BOOL focusURLBar = ([toolbar isVisible] &&
@ -1087,7 +1086,7 @@ static NSArray* sToolbarDefaults = nil;
-(void)openNewTabWithURL: (NSString*)aURLSpec referrer:(NSString*)aReferrer loadInBackground: (BOOL)aLoadInBG
{
CHIconTabViewItem* newTab = [[[CHIconTabViewItem alloc] initWithIdentifier: nil] autorelease];
BrowserTabViewItem* newTab = [BrowserTabView makeNewTabItem];
// hyatt originally made new tabs open on the far right and tabs opened from a content
// link open to the right of the current tab. The idea was to keep the new tab
@ -1476,6 +1475,10 @@ static NSArray* sToolbarDefaults = nil;
return mSidebarDrawer;
}
- (CHPageProxyIcon *)proxyIconView
{
return mProxyIcon;
}
- (id)windowWillReturnFieldEditor:(NSWindow *)aWindow toObject:(id)anObject
{

3
chimera/src/browser/BrowserWindowController.h
View File

@ -278,5 +278,8 @@ class nsIDOMNode;
// Accessor to get the sidebar drawer
- (NSDrawer *)sidebarDrawer;
// Accessor to get the proxy icon view
- (CHPageProxyIcon *)proxyIconView;
@end

11
chimera/src/browser/BrowserWindowController.mm
View File

@ -40,7 +40,6 @@
#import "BrowserWindowController.h"
#import "CHBrowserWrapper.h"
#import "CHIconTabViewItem.h"
#import "CHPreferenceManager.h"
#import "BookmarksDataSource.h"
#import "CHHistoryDataSource.h"
@ -968,7 +967,7 @@ static NSArray* sToolbarDefaults = nil;
-(void)newTab:(BOOL)allowHomepage
{
CHIconTabViewItem* newTab = [[[CHIconTabViewItem alloc] initWithIdentifier: nil] autorelease];
BrowserTabViewItem* newTab = [BrowserTabView makeNewTabItem];
CHBrowserWrapper* newView = [[[CHBrowserWrapper alloc] initWithTab: newTab andWindow: [mTabBrowser window]] autorelease];
PRInt32 newTabPage = 0;
@ -980,7 +979,7 @@ static NSArray* sToolbarDefaults = nil;
[newTab setLabel: ((newTabPage == 1) ? NSLocalizedString(@"TabLoading", @"") : NSLocalizedString(@"UntitledPageTitle", @""))];
[newTab setView: newView];
[mTabBrowser addTabViewItem: newTab];
// Focus the URL bar if we're opening a blank tab and the URL bar is visible.
NSToolbar* toolbar = [[self window] toolbar];
BOOL focusURLBar = ([toolbar isVisible] &&
@ -1087,7 +1086,7 @@ static NSArray* sToolbarDefaults = nil;
-(void)openNewTabWithURL: (NSString*)aURLSpec referrer:(NSString*)aReferrer loadInBackground: (BOOL)aLoadInBG
{
CHIconTabViewItem* newTab = [[[CHIconTabViewItem alloc] initWithIdentifier: nil] autorelease];
BrowserTabViewItem* newTab = [BrowserTabView makeNewTabItem];
// hyatt originally made new tabs open on the far right and tabs opened from a content
// link open to the right of the current tab. The idea was to keep the new tab
@ -1476,6 +1475,10 @@ static NSArray* sToolbarDefaults = nil;
return mSidebarDrawer;
}
- (CHPageProxyIcon *)proxyIconView
{
return mProxyIcon;
}
- (id)windowWillReturnFieldEditor:(NSWindow *)aWindow toObject:(id)anObject
{