chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc - Issue 10905242: add ash_resources.grd and necessary changes to use images in ash/resources

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/ash/browser_non_client_frame_view_ash.cc

Issue 10905242: add ash_resources.grd and necessary changes to use images in ash/resources (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: don't guard ash_strings with aura=1 Created 8 years, 3 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « ash/wm/workspace/multi_window_resize_controller.cc ('k') | chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc

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

index ac73167b5bdbfe33346bf0efda7eb0b98e67e54c..445a4bcb1ba89edaf792344616a99e1f96149702 100644

--- a/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc

+++ b/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc

@@ -18,9 +18,9 @@

#include "chrome/browser/ui/views/tabs/tab_strip.h"

#include "chrome/browser/ui/views/toolbar_view.h"

#include "content/public/browser/web_contents.h"

+#include "grit/ash_resources.h"

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

#include "grit/theme_resources.h"

-#include "grit/ui_resources.h"

#include "ui/aura/client/aura_constants.h"

#include "ui/aura/window.h"

#include "ui/base/accessibility/accessible_view_state.h"