Commit 5d748e12 authored by dubroy@chromium.org's avatar dubroy@chromium.org

[Mac] Website settings: Implement custom tab appearance.

BUG=
TEST=

Review URL: https://chromiumcodereview.appspot.com/10827029

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151051 0039d316-1c4b-4281-b951-d872f2087c98
parent 8904bd57
......@@ -827,6 +827,10 @@
<structure type="chrome_scaled_image" name="IDR_VOLUME_BUBBLE_UP_ICON" file="volume_up_icon.png" />
</if>
<structure type="chrome_scaled_image" name="IDR_WARNING" file="alert_small.png" />
<structure type="chrome_scaled_image" name="IDR_WEBSITE_SETTINGS_TAB_BACKGROUND" file="website_settings_tab_background.png" />
<structure type="chrome_scaled_image" name="IDR_WEBSITE_SETTINGS_TAB_CENTER" file="website_settings_tab_center.png" />
<structure type="chrome_scaled_image" name="IDR_WEBSITE_SETTINGS_TAB_LEFT" file="website_settings_tab_left.png" />
<structure type="chrome_scaled_image" name="IDR_WEBSITE_SETTINGS_TAB_RIGHT" file="website_settings_tab_right.png" />
<if expr="not pp_ifdef('_google_chrome')">
<structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON" file="chromium/webstore_icon.png" />
<structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_16" file="chromium/webstore_icon_16.png" />
......
......@@ -17,6 +17,7 @@ class WebsiteSettingsUIBridge;
@interface WebsiteSettingsBubbleController : BaseBubbleController {
@private
scoped_nsobject<NSView> contentView_;
scoped_nsobject<NSSegmentedControl> segmentedControl_;
scoped_nsobject<NSTabView> tabView_;
// Displays the web site identity.
......
......@@ -92,8 +92,9 @@ class WebsiteSettingsBubbleControllerTest : public CocoaTest {
EXPECT_EQ(1U, [window_subviews count]);
NSArray* subviews = [[window_subviews lastObject] subviews];
// Expect 3 views: the identity, identity status, and the tab view.
EXPECT_EQ(3U, [subviews count]);
// Expect 4 views: the identity, identity status, the segmented control
// (which implements the tab strip), and the tab view.
EXPECT_EQ(4U, [subviews count]);
bool desired_result = match_type == TEXT_EQUAL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment