chrome/browser/ui/views/ash/chrome_shell_delegate.cc - Issue 10828151: chrome: Copy app_list files from views/ to ash/

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

Issue 10828151: chrome: Copy app_list files from views/ to ash/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 4 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/ash/chrome_shell_delegate.cc

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

index 3a3da7956b5616085645404ba842e05c9337199d..ba5ea3715389411bfc72efc5fa07cd7a0dffd93c 100644

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

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

@@ -14,10 +14,10 @@

#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/browser/sessions/tab_restore_service.h"

#include "chrome/browser/sessions/tab_restore_service_factory.h"

+#include "chrome/browser/ui/ash/app_list/app_list_view_delegate.h"

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

#include "chrome/browser/ui/browser_commands.h"

#include "chrome/browser/ui/browser_finder.h"

-#include "chrome/browser/ui/views/ash/app_list/app_list_view_delegate.h"

#include "chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h"

#include "chrome/browser/ui/views/ash/user_action_handler.h"

tfarina 2012/08/03 13:42:50 these two can also be moved to ui/ash. They do not

#include "chrome/browser/ui/views/ash/window_positioner.h"