Search state transitions not working

chrome/browser/ui/views/frame/browser_view.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/ui/views/frame/browser_view.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 849 matching lines @@
   DCHECK(theme_provider);
 
   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:
+    case chrome::search::Mode::MODE_SEARCH_SUGGESTIONS:
+    case chrome::search::Mode::MODE_SEARCH_RESULTS:
       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* BrowserView::GetToolbarBackgroundImage(
       chrome::search::Mode::Type mode) {
   ui::ThemeProvider* theme_provider = GetThemeProvider();
   DCHECK(theme_provider);
   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_SEARCH_SUGGESTIONS:
+    case chrome::search::Mode::MODE_SEARCH_RESULTS:
     case chrome::search::Mode::MODE_DEFAULT:
     default:
       return theme_provider->GetImageSkiaNamed(IDR_THEME_TOOLBAR_SEARCH);
   }
 }
 
 LocationBar* BrowserView::GetLocationBar() const {
   return GetLocationBarView();
 }
 
@@ skipping 1701 matching lines @@
 
   Browser* modal_browser =
       browser::FindBrowserWithWebContents(active_dialog->web_contents());
   if (modal_browser && (browser_ != modal_browser)) {
     modal_browser->window()->FlashFrame(true);
     modal_browser->window()->Activate();
   }
 
   AppModalDialogQueue::GetInstance()->ActivateModalDialog();
 }