chrome/browser/ui/ash/launcher/browser_launcher_item_controller_unittest.cc - Issue 10828247: launcher: Switch 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/ash/launcher/browser_launcher_item_controller_unittest.cc

Issue 10828247: launcher: Switch 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/ash/app_list/extension_app_item.cc ('k') | chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/browser_launcher_item_controller_unittest.cc

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

index 0c4f1b3bba5f266809e306ae131f69112d602a91..1281c1132b65257b854a74a90f7a05f06bb0dad8 100644

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

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

@@ -2,24 +2,24 @@

// 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 <map>

#include <string>

#include "ash/launcher/launcher_model.h"

#include "base/memory/scoped_ptr.h"

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

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

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

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

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

#include "chrome/test/base/chrome_render_view_host_test_harness.h"

#include "chrome/test/base/testing_profile.h"

#include "content/public/test/test_browser_thread.h"

#include "testing/gtest/include/gtest/gtest.h"

#include "third_party/skia/include/core/SkBitmap.h"

-#include "ui/aura/client/aura_constants.h"

#include "ui/aura/client/activation_delegate.h"

+#include "ui/aura/client/aura_constants.h"

#include "ui/aura/root_window.h"

#include "ui/aura/test/test_activation_client.h"

#include "ui/aura/test/test_window_delegate.h"