alternate ntp (cros/partial-win): add tab-related stuff and toolbar/tab background change

chrome/browser/ui/views/frame/browser_non_client_frame_view.cc

Index: chrome/browser/ui/views/frame/browser_non_client_frame_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc
index 42430089d6e415179cb7bb1d5b863bb1c89c962a..2c076c3b52c2442e1313e0e29ed97c721354b786 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc
@@ -10,6 +10,8 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/themes/theme_service.h"
+#include "chrome/browser/ui/search/search.h"
 #include "chrome/browser/ui/views/avatar_menu_button.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "grit/theme_resources.h"
@@ -84,6 +86,50 @@ void BrowserNonClientFrameView::UpdateAvatarInfo() {
   }
 }
 
+SkColor BrowserNonClientFrameView::GetToolbarBackgroundColor(
+    chrome::search::Mode::Type mode) {
+  ui::ThemeProvider* theme_provider = GetThemeProvider();
+  DCHECK(theme_provider);
+
+  Browser* browser = browser_view_->browser();
+  if (!chrome::search::IsInstantExtendedAPIEnabled(browser->profile()))
+    return theme_provider->GetColor(ThemeService::COLOR_TOOLBAR);
+
+  switch (mode) {
+    case chrome::search::Mode::MODE_NTP:
+      return theme_provider->GetColor(
+          ThemeService::COLOR_SEARCH_NTP_BACKGROUND);
+
+    case chrome::search::Mode::MODE_SEARCH:
+      return theme_provider->GetColor(
+          ThemeService::COLOR_SEARCH_SEARCH_BACKGROUND);
+
+    case chrome::search::Mode::MODE_DEFAULT:
+    default:
+      return theme_provider->GetColor(
+          ThemeService::COLOR_SEARCH_DEFAULT_BACKGROUND);
+  }
+}
+
+gfx::ImageSkia* BrowserNonClientFrameView::GetToolbarBackgroundImage(
+      chrome::search::Mode::Type mode) {
+  ui::ThemeProvider* theme_provider = GetThemeProvider();
+  DCHECK(theme_provider);
+  Browser* browser = browser_view_->browser();
+  if (!chrome::search::IsInstantExtendedAPIEnabled(browser->profile()))
+    return theme_provider->GetImageSkiaNamed(IDR_THEME_TOOLBAR);
+
+  switch (mode) {
+    case chrome::search::Mode::MODE_NTP:
+      return theme_provider->GetImageSkiaNamed(IDR_THEME_NTP_BACKGROUND);
+
+    case chrome::search::Mode::MODE_SEARCH:
+    case chrome::search::Mode::MODE_DEFAULT:
+    default:
+      return theme_provider->GetImageSkiaNamed(IDR_THEME_TOOLBAR_SEARCH);
+  }
+}
+
 void BrowserNonClientFrameView::VisibilityChanged(views::View* starting_from,
                                                   bool is_visible) {
   if (!is_visible)