chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h - 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.h

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.h

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

index 8869a649f994cc76d5ee93a2822b67d1b4244b28..c8b888d2994740041438ee77e8a0216d8d384eb5 100644

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

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

@@ -2,8 +2,8 @@

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

// found in the LICENSE file.

-#ifndef CHROME_BROWSER_UI_VIEWS_ASH_LAUNCHER_BROWSER_LAUNCHER_ITEM_CONTROLLER_H_

-#define CHROME_BROWSER_UI_VIEWS_ASH_LAUNCHER_BROWSER_LAUNCHER_ITEM_CONTROLLER_H_

+#ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_LAUNCHER_ITEM_CONTROLLER_H_

+#define CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_LAUNCHER_ITEM_CONTROLLER_H_

#include <string>

@@ -13,8 +13,8 @@

#include "base/gtest_prod_util.h"

#include "base/memory/scoped_ptr.h"

#include "base/string16.h"

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

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

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

#include "ui/aura/window_observer.h"

class Browser;

@@ -156,4 +156,4 @@ class BrowserLauncherItemController : public TabStripModelObserver,

DISALLOW_COPY_AND_ASSIGN(BrowserLauncherItemController);

};

-#endif // CHROME_BROWSER_UI_VIEWS_ASH_LAUNCHER_BROWSER_LAUNCHER_ITEM_CONTROLLER_H_

+#endif // CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_LAUNCHER_ITEM_CONTROLLER_H_