Merge 264110 "linux_aura: Remove the 'a' badge."

> linux_aura: Remove the 'a' badge.
> 
> Also bumps the theme version so that cached 'a' assets that might live
> in the BrowserThemePack get regenerated.
> 
> BUG=343787, 360905
> 
> Review URL: https://codereview.chromium.org/237963002

TBR=erg@chromium.org

Review URL: https://codereview.chromium.org/247623004

git-svn-id: svn://svn.chromium.org/chrome/branches/1916/src@265339 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 5 insertions, 26 deletions

diff --git a/chrome/app/theme/default_100_percent/common/browser_tools_badge_aura.png b/chrome/app/theme/default_100_percent/common/browser_tools_badge_aura.png
deleted file mode 100644
index 42a7d5b..0000000
--- a/chrome/app/theme/default_100_percent/common/browser_tools_badge_aura.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/common/browser_tools_normal_aura.png b/chrome/app/theme/default_100_percent/common/browser_tools_normal_aura.png
deleted file mode 100644
index 75491bf..0000000
--- a/chrome/app/theme/default_100_percent/common/browser_tools_normal_aura.png
+++ /dev/null
diff --git a/chrome/app/theme/default_200_percent/common/browser_tools_badge_aura.png b/chrome/app/theme/default_200_percent/common/browser_tools_badge_aura.png
deleted file mode 100644
index 78fd405..0000000
--- a/chrome/app/theme/default_200_percent/common/browser_tools_badge_aura.png
+++ /dev/null
diff --git a/chrome/app/theme/default_200_percent/common/browser_tools_normal_aura.png b/chrome/app/theme/default_200_percent/common/browser_tools_normal_aura.png
deleted file mode 100644
index 136fc68..0000000
--- a/chrome/app/theme/default_200_percent/common/browser_tools_normal_aura.png
+++ /dev/null
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index e817da9..1021265 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -1238,14 +1238,8 @@
         <structure type="chrome_scaled_image" name="IDR_TOOLS_H" file="tools_hover.png" />
         <structure type="chrome_scaled_image" name="IDR_TOOLS_P" file="tools_pressed.png" />
       </if>
-      <if expr="toolkit_views or is_macosx or is_ios">
-        <if expr="desktop_linux">
-          <structure type="chrome_scaled_image" name="IDR_TOOLS_BADGE_AURA" file="common/browser_tools_badge_aura.png" />
-          <structure type="chrome_scaled_image" name="IDR_TOOLS" file="common/browser_tools_normal_aura.png" />
-        </if>
-        <if expr="not desktop_linux">
-          <structure type="chrome_scaled_image" name="IDR_TOOLS" file="common/browser_tools_normal.png" />
-        </if>
+      <if expr="pp_ifdef('toolkit_views') or is_macosx or is_ios">
+        <structure type="chrome_scaled_image" name="IDR_TOOLS" file="common/browser_tools_normal.png" />
         <structure type="chrome_scaled_image" name="IDR_TOOLS_H" file="common/browser_tools_hover.png" />
         <structure type="chrome_scaled_image" name="IDR_TOOLS_P" file="common/browser_tools_pressed.png" />
       </if>
diff --git a/chrome/browser/themes/browser_theme_pack.cc b/chrome/browser/themes/browser_theme_pack.cc
index 2603efa..e8f5de1 100644
--- a/chrome/browser/themes/browser_theme_pack.cc
+++ b/chrome/browser/themes/browser_theme_pack.cc
@@ -43,7 +43,7 @@ namespace {
 // Version number of the current theme pack. We just throw out and rebuild
 // theme packs that aren't int-equal to this. Increment this number if you
 // change default theme assets.
-const int kThemePackVersion = 32;
+const int kThemePackVersion = 33;
 
 // IDs that are in the DataPack won't clash with the positive integer
 // uint16. kHeaderID should always have the maximum value because we want the
diff --git a/chrome/browser/ui/views/toolbar/wrench_toolbar_button.cc b/chrome/browser/ui/views/toolbar/wrench_toolbar_button.cc
index 4271129..c3c5d7d 100644
--- a/chrome/browser/ui/views/toolbar/wrench_toolbar_button.cc
+++ b/chrome/browser/ui/views/toolbar/wrench_toolbar_button.cc
@@ -26,12 +26,6 @@ void WrenchToolbarButton::SetSeverity(WrenchIconPainter::Severity severity,
 }
 
 void WrenchToolbarButton::OnPaint(gfx::Canvas* canvas) {
-  // Badge linux aura builds so they're quickly identifiable.
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-  wrench_icon_painter_->set_badge(
-      *GetThemeProvider()->GetImageSkiaNamed(IDR_TOOLS_BADGE_AURA));
-#endif
-
   wrench_icon_painter_->Paint(
       canvas, GetThemeProvider(), gfx::Rect(size()), GetCurrentBezelType());
   views::Painter::PaintFocusPainter(this, canvas, focus_painter());
diff --git a/chrome/common/chrome_version_info_posix.cc b/chrome/common/chrome_version_info_posix.cc
index a243b07..98aa72f 100644
--- a/chrome/common/chrome_version_info_posix.cc
+++ b/chrome/common/chrome_version_info_posix.cc
@@ -12,13 +12,8 @@ namespace chrome {
 // static
 std::string VersionInfo::GetVersionStringModifier() {
   char* env = getenv("CHROME_VERSION_EXTRA");
-  if (!env) {
-    std::string modifier;
-#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
-    modifier = "aura";
-#endif
-    return modifier;
-  }
+  if (!env)
+    return std::string();
   std::string modifier(env);
 
 #if defined(GOOGLE_CHROME_BUILD)
@@ -34,10 +29,6 @@ std::string VersionInfo::GetVersionStringModifier() {
   }
 #endif
 
-#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
-  modifier += " aura";
-#endif
-
   return modifier;
 }