chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc - Issue 292443002: linux_aura: Compile ash into chrome.

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

Issue 292443002: linux_aura: Compile ash into chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src

Patch Set: Rebase to ToT Created 6 years, 7 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 | « chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc ('k') | chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc

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

index e21dc4fb23fc3daa737a262bc88de317ee1f05ed..f6393124dce2b34be8eb2f7a96d0c21c0b904e69 100644

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

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

@@ -58,7 +58,6 @@ class DesktopThemeProvider : public ui::ThemeProvider {

virtual bool HasCustomImage(int id) const OVERRIDE {

return delegate_->HasCustomImage(

chrome::MapThemeImage(chrome::HOST_DESKTOP_TYPE_NATIVE, id));

}

virtual base::RefCountedMemory* GetRawData(

int id,