chrome/browser/ui/views/toolbar/browser_actions_container.cc - Issue 480693002: Use a qualified path for ui_resources.h grit includes.

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/toolbar/browser_actions_container.cc

Issue 480693002: Use a qualified path for ui_resources.h grit includes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: REBASE Created 6 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/toolbar/browser_actions_container.cc

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

index 828b916a8df3892f3d3d0b5d690ae622ff65f51b..491d85c9cd3c6e18d9a9f0dbae86ad23f53b4f81 100644

--- a/chrome/browser/ui/views/toolbar/browser_actions_container.cc

+++ b/chrome/browser/ui/views/toolbar/browser_actions_container.cc

@@ -26,7 +26,6 @@

#include "extensions/common/feature_switch.h"

#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

-#include "grit/ui_resources.h"

#include "third_party/skia/include/core/SkColor.h"

#include "ui/accessibility/ax_view_state.h"

#include "ui/base/dragdrop/drag_utils.h"

@@ -37,6 +36,7 @@

#include "ui/gfx/animation/slide_animation.h"

#include "ui/gfx/canvas.h"

#include "ui/gfx/geometry/rect.h"

+#include "ui/resources/grit/ui_resources.h"

#include "ui/views/controls/button/label_button_border.h"

#include "ui/views/controls/button/menu_button.h"

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