chrome/browser/ui/ash/launcher/browser_launcher_item_controller.cc - Issue 10826219: launcher: Fix include paths and header guards.

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

Issue 10826219: launcher: Fix include paths and header guards. (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/ash/launcher/browser_launcher_item_controller.cc

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

index 24f1eea6a62eb58c7905dbcc4c16f452b1a4fede..b473e2b2d344d4698995c0e9f616103d335a7299 100644

--- a/chrome/browser/ui/ash/launcher/browser_launcher_item_controller.cc

+++ b/chrome/browser/ui/ash/launcher/browser_launcher_item_controller.cc

@@ -2,7 +2,7 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

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

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

#include "ash/launcher/launcher.h"

#include "ash/launcher/launcher_model.h"

@@ -12,11 +12,11 @@

#include "chrome/browser/extensions/tab_helper.h"

#include "chrome/browser/favicon/favicon_tab_helper.h"

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

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

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

#include "chrome/browser/ui/browser_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/launcher/chrome_launcher_controller.h"

#include "chrome/browser/web_applications/web_app.h"

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

#include "grit/ui_resources.h"