chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.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/launcher/chrome_launcher_controller.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/launcher/chrome_launcher_controller.cc

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

index c9b644eb44fd4650e2f8538e0b1cb24a6e7a1569..e5fe0e50ba28df185f50ff206c89e3eb41faa463 100644

--- a/chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.cc

+++ b/chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.cc

@@ -22,6 +22,7 @@

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

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

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

+#include "chrome/browser/ui/ash/extension_utils.h"

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

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

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

@@ -29,7 +30,6 @@

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

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

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

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

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

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

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