chrome/browser/ui/views/frame/browser_view.cc - Issue 10837240: Search state transitions not working

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 10837240: Search state transitions not working (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: OVERRIDE Created 8 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/ui/views/frame/browser_view.cc

diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc

index 042f8ecd7b396a1d42cf33e7fb272ead27fe7442..f2cfa1b43a487b5164707c2fe370d241badca319 100644

--- a/chrome/browser/ui/views/frame/browser_view.cc

+++ b/chrome/browser/ui/views/frame/browser_view.cc

@@ -867,7 +867,8 @@ SkColor BrowserView::GetToolbarBackgroundColor(

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);

@@ -889,7 +890,8 @@ gfx::ImageSkia* BrowserView::GetToolbarBackgroundImage(

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);