chrome/browser/ui/views/frame/app_non_client_frame_view_aura.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/ui/views/frame/app_non_client_frame_view_aura.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/ui/views/frame/app_non_client_frame_view_aura.cc

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

index 00841de75245790618481c96d683d6ce1ca765c4..f15c5d159d240600fe25f9e66681f90b066682ef 100644

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

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

@@ -9,9 +9,7 @@

#include "chrome/browser/ui/views/frame/browser_view.h"

#include "grit/generated_resources.h" // Accessibility names

#include "grit/theme_resources.h"

-#include "grit/theme_resources_standard.h"

#include "grit/ui_resources.h"

-#include "grit/ui_resources_standard.h"

#include "ui/aura/window.h"

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

#include "ui/base/hit_test.h"