Add custom default theme support and create a managed user default theme.

chrome/browser/themes/browser_theme_pack.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/themes/browser_theme_pack.h"
 
 #include <limits>
 
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 11 matching lines @@
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "net/base/file_stream.h"
 #include "net/base/net_errors.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/base/resource/data_pack.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/image/canvas_image_source.h"
+#include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/size_conversions.h"
 #include "ui/gfx/skia_util.h"
 
 using content::BrowserThread;
 using extensions::Extension;
 
 namespace {
@@ skipping 842 matching lines @@
       if (it != image_memory_.end()) {
         memory = it->second.get();
       }
     }
   }
 
   return memory;
 }
 
 // static
 void BrowserThemePack::GetThemeableImageIDRs(std::set<int>* result) {

[pkotwicz, 2013/07/19 18:33:20]

Reorder this method to match reordering in the header file.

[Adrian Kuegel, 2013/07/22 12:58:08]

Done.

   if (!result)
     return;
 
   result->clear();
   for (size_t i = 0; i < kPersistingImagesLength; ++i)
     result->insert(kPersistingImages[i].idr_id);
 
 #if defined(OS_WIN) && defined(USE_AURA)
   for (size_t i = 0; i < kPersistingImagesWinDesktopAuraLength; ++i)
     result->insert(kPersistingImagesWinDesktopAura[i].idr_id);
@@ skipping 10 matching lines @@
     if (*img == prs_id)
       return true;
   }
 
   return false;
 }
 
 // private:
 
 BrowserThemePack::BrowserThemePack()
-    : header_(NULL),
+    : CustomThemeSupplier(EXTENSION),
+      header_(NULL),
       tints_(NULL),
       colors_(NULL),
       display_properties_(NULL),
       source_images_(NULL) {
   scale_factors_ = ui::GetSupportedScaleFactors();
 }
 
 void BrowserThemePack::BuildHeader(const Extension* extension) {
   header_ = new BrowserThemePackHeader;
   header_->version = kThemePackVersion;
@@ skipping 668 matching lines @@
                                            false,
                                            &bitmap_data)) {
       NOTREACHED() << "Unable to encode theme image for prs_id="
                    << prs_id << " for scale_factor=" << scale_factors_[i];
       break;
     }
     image_memory_[scaled_raw_id] =
         base::RefCountedBytes::TakeVector(&bitmap_data);
   }
 }