summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa/page_info_window_controller.h
diff options
context:
space:
mode:
authorrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-14 19:47:28 +0000
committerrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-14 19:47:28 +0000
commit71675dc7c08391291930adf99d27423ca1ffeb2b (patch)
tree19abce48d8051e357c15209b2952cd7767380cc3 /chrome/browser/cocoa/page_info_window_controller.h
parent9ab634a9baae725ee745436a85fd970dcda784fe (diff)
downloadchromium_src-71675dc7c08391291930adf99d27423ca1ffeb2b.zip
chromium_src-71675dc7c08391291930adf99d27423ca1ffeb2b.tar.gz
chromium_src-71675dc7c08391291930adf99d27423ca1ffeb2b.tar.bz2
[Mac] Rewrite the page info window to be built dynamically.
Rather than using a XIB, the window is now built entirely in code. The Controller's unit test has been removed because after this it is functionally useless. A new test for the bridge has been added. This also fixes the text clipping bug for the mixed content warning. BUG=23438,30843 TEST=No functional change; partially covered by unit tests. Review URL: http://codereview.chromium.org/2066003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47301 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/page_info_window_controller.h')
-rw-r--r--chrome/browser/cocoa/page_info_window_controller.h35
1 files changed, 1 insertions, 34 deletions
diff --git a/chrome/browser/cocoa/page_info_window_controller.h b/chrome/browser/cocoa/page_info_window_controller.h
index c8e5564..4a9624c 100644
--- a/chrome/browser/cocoa/page_info_window_controller.h
+++ b/chrome/browser/cocoa/page_info_window_controller.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -16,49 +16,16 @@ class PrefService;
@interface PageInfoWindowController : NSWindowController {
@private
- // We load both images and then we share the refs with our UI elements.
- scoped_nsobject<NSImage> goodImg_;
- scoped_nsobject<NSImage> badImg_;
-
- // User interface item values. The NIB uses KVO to get these, so the values
- // are not explicitly set in the view by the controller.
- NSImage* identityImg_;
- NSImage* connectionImg_;
- NSImage* historyImg_;
- NSString* identityMsg_;
- NSString* connectionMsg_;
- NSString* historyMsg_;
- BOOL enableCertButton_;
-
- // Box that allows us to show/hide the history information.
- IBOutlet NSBox* historyBox_;
-
// Bridge to Chromium that we own.
scoped_ptr<PageInfoWindowMac> pageInfo_;
scoped_nsobject<WindowSizeAutosaver> sizeSaver_;
}
-@property(readwrite, retain) NSImage* identityImg;
-@property(readwrite, retain) NSImage* connectionImg;
-@property(readwrite, retain) NSImage* historyImg;
-@property(readwrite, copy) NSString* identityMsg;
-@property(readwrite, copy) NSString* connectionMsg;
-@property(readwrite, copy) NSString* historyMsg;
-@property(readwrite) BOOL enableCertButton;
-
// Sets the bridge between Cocoa and Chromium.
- (void)setPageInfo:(PageInfoWindowMac*)pageInfo;
-// Returns the good and bad image refs.
-- (NSImage*)goodImg;
-- (NSImage*)badImg;
-
// Shows the certificate display window
- (IBAction)showCertWindow:(id)sender;
-// Sets whether or not to show or hide the history box. This will resize the
-// frame of the window.
-- (void)setShowHistoryBox:(BOOL)show;
-
@end