chrome/browser/ui/views/search_view_controller.cc - Issue 10832287: ash: Remove old files and update DEPS whitelist.

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/search_view_controller.cc

Issue 10832287: ash: Remove old files and update DEPS whitelist. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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/search_view_controller.cc

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

index f2b6e45809687d8e9718967b3568dac53a7959a4..fc59c42dcecf54c011ac8b19c3848a477ac4b313 100644

--- a/chrome/browser/ui/views/search_view_controller.cc

+++ b/chrome/browser/ui/views/search_view_controller.cc

@@ -14,9 +14,9 @@

#include "chrome/browser/ui/webui/instant_ui.h"

#include "chrome/common/url_constants.h"

#include "grit/theme_resources.h"

+#include "ui/base/resource/resource_bundle.h"

#include "ui/compositor/layer.h"

#include "ui/compositor/scoped_layer_animation_settings.h"

-#include "ui/base/resource/resource_bundle.h"

#include "ui/gfx/canvas.h"

#include "ui/views/controls/webview/webview.h"

#include "ui/views/layout/fill_layout.h"