diff options
| author | glen@google.com <glen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-02 00:44:22 +0000 |
|---|---|---|
| committer | glen@google.com <glen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-02 00:44:22 +0000 |
| commit | 9e43dae7106b6064ebc6580fe111568f1cbdd393 (patch) | |
| tree | 73faf29f3fdf1f0ab786f90880c44b8f3e6cf7fe /chrome | |
| parent | 84b57846bc0e40d830cc4fc4fb429b1990ad2442 (diff) | |
| download | chromium_src-9e43dae7106b6064ebc6580fe111568f1cbdd393.zip chromium_src-9e43dae7106b6064ebc6580fe111568f1cbdd393.tar.gz chromium_src-9e43dae7106b6064ebc6580fe111568f1cbdd393.tar.bz2 | |
Make our distributor logo light on XP (and leave it dark on Vista).
Also conveniently fixes accessibility test 'failures' introduced by the last distributor logo change.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/theme/distributor_logo_light.png | bin | 0 -> 1085 bytes | |||
| -rw-r--r-- | chrome/app/theme/theme_resources.h | 1 | ||||
| -rw-r--r-- | chrome/app/theme/theme_resources.rc | 1 | ||||
| -rw-r--r-- | chrome/browser/xp_frame.cc | 4 | ||||
| -rw-r--r-- | chrome/test/accessibility/constants.h | 8 |
5 files changed, 8 insertions, 6 deletions
diff --git a/chrome/app/theme/distributor_logo_light.png b/chrome/app/theme/distributor_logo_light.png Binary files differnew file mode 100644 index 0000000..8a2b067 --- /dev/null +++ b/chrome/app/theme/distributor_logo_light.png diff --git a/chrome/app/theme/theme_resources.h b/chrome/app/theme/theme_resources.h index f828eeb..f3fc518 100644 --- a/chrome/app/theme/theme_resources.h +++ b/chrome/app/theme/theme_resources.h @@ -311,3 +311,4 @@ #define IDR_OTR_ICON_STANDALONE 9380 #define IDR_PRODUCT_LOGO 9381 #define IDR_DISTRIBUTOR_LOGO 9382 +#define IDR_DISTRIBUTOR_LOGO_LIGHT 9383 diff --git a/chrome/app/theme/theme_resources.rc b/chrome/app/theme/theme_resources.rc index 7ff522a..5560c7f 100644 --- a/chrome/app/theme/theme_resources.rc +++ b/chrome/app/theme/theme_resources.rc @@ -307,3 +307,4 @@ IDR_THROBBER_LIGHT BINDATA "throbber_light.png" IDR_OTR_ICON_STANDALONE BINDATA "otr_icon_standalone.png" IDR_PRODUCT_LOGO BINDATA "product_logo.png" IDR_DISTRIBUTOR_LOGO BINDATA "distributor_logo.png" +IDR_DISTRIBUTOR_LOGO_LIGHT BINDATA "distributor_logo_light.png" diff --git a/chrome/browser/xp_frame.cc b/chrome/browser/xp_frame.cc index 22f132f..94a59a1 100644 --- a/chrome/browser/xp_frame.cc +++ b/chrome/browser/xp_frame.cc @@ -83,7 +83,7 @@ static const int kToolbarOverlapVertOffset = 3; static const int kTabShadowSize = 2; static const int kDistributorLogoHorizontalOffset = 7; -static const int kDistributorLogoVerticalOffset = 4; +static const int kDistributorLogoVerticalOffset = 3; // Size of a corner. We use this when drawing a black background in maximized // mode @@ -462,7 +462,7 @@ void XPFrame::Init() { distributor_logo_ = new ChromeViews::ImageView(); frame_view_->AddViewToDropList(distributor_logo_); - distributor_logo_->SetImage(rb.GetBitmapNamed(IDR_DISTRIBUTOR_LOGO)); + distributor_logo_->SetImage(rb.GetBitmapNamed(IDR_DISTRIBUTOR_LOGO_LIGHT)); frame_view_->AddChildView(distributor_logo_); min_button_ = new ChromeViews::Button(); diff --git a/chrome/test/accessibility/constants.h b/chrome/test/accessibility/constants.h index 3e2947a..8df263f 100644 --- a/chrome/test/accessibility/constants.h +++ b/chrome/test/accessibility/constants.h @@ -62,10 +62,10 @@ // Chrome Client chidren. #define BROWSER_VIEW_ACC_INDEX (0) #define TABSTRIP_ACC_INDEX (1) -#define CHROME_MIN_ACC_INDEX (3) -#define CHROME_MAX_ACC_INDEX (4) -#define CHROME_RESTORE_ACC_INDEX (5) -#define CHROME_CLOSE_ACC_INDEX (6) +#define CHROME_MIN_ACC_INDEX (4) +#define CHROME_MAX_ACC_INDEX (5) +#define CHROME_RESTORE_ACC_INDEX (6) +#define CHROME_CLOSE_ACC_INDEX (7) // Browser View children. #define TOOLBAR_ACC_INDEX (0) |
