chrome/browser/ui/views/aura/chrome_shell_delegate.cc - Issue 8914023: Relands fixes for 106432, 107287 and 107401. These got reverted

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/aura/chrome_shell_delegate.cc

Issue 8914023: Relands fixes for 106432, 107287 and 107401. These got reverted (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Da fix Created 9 years 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/aura/chrome_shell_delegate.cc

diff --git a/chrome/browser/ui/views/aura/chrome_shell_delegate.cc b/chrome/browser/ui/views/aura/chrome_shell_delegate.cc

index fdfee855693203798230df1548913b8f6dbbb09a..631c7521228756e5c77a9f34df4c2b28520164b2 100644

--- a/chrome/browser/ui/views/aura/chrome_shell_delegate.cc

+++ b/chrome/browser/ui/views/aura/chrome_shell_delegate.cc

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

#include "chrome/browser/ui/views/aura/app_list_window.h"

#include "chrome/browser/ui/views/aura/status_area_host_aura.h"

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

+#include "grit/theme_resources.h"

#include "ui/aura/window.h"

#include "ui/aura_shell/launcher/launcher_types.h"

#include "ui/aura_shell/window_util.h"

@@ -76,3 +77,7 @@ bool ChromeShellDelegate::ConfigureLauncherItem(

return view &&

ShouldCreateLauncherItemForBrowser(view->browser(), &(item->type));

}

+int ChromeShellDelegate::GetResourceIDForNewBrowserWindow() {

+ return IDR_PRODUCT_LOGO_32;