chrome/browser/cookies_tree_model.cc - Issue 10756018: Merge grd files in ui/resources and chrome/app/theme

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

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase, *_standard.rc Created 8 years, 5 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/cookies_tree_model.cc

diff --git a/chrome/browser/cookies_tree_model.cc b/chrome/browser/cookies_tree_model.cc

index ab44437b6649632e4f576c7d27566e91cdfa02f8..45a8b9e21e956f8f4749c0b313e72560f5b9810c 100644

--- a/chrome/browser/cookies_tree_model.cc

+++ b/chrome/browser/cookies_tree_model.cc

@@ -19,7 +19,6 @@

#include "content/public/common/url_constants.h"

#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

-#include "grit/theme_resources_standard.h"

#include "grit/ui_resources.h"

#include "net/base/registry_controlled_domain.h"

#include "net/cookies/cookie_monster.h"