chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc - Issue 515563003: Remove dependency of chrome in WebRequestPermissions.

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

Issue 515563003: Remove dependency of chrome in WebRequestPermissions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Updated. Created 6 years, 3 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/launcher/chrome_launcher_controller.cc ('k') | chrome/browser/ui/sync/profile_signin_confirmation_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 2604e88027ba7a888ff1d7e190c1360a81fc047b..88a475549a175afbb466ca6bb25ac64899822919 100644

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

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

@@ -2066,16 +2066,16 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, OverflowBubble) {

// still gets detected properly.

IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, V1AppNavigation) {

// We assume that the web store is always there (which it apparently is).

- controller_->PinAppWithID(extension_misc::kWebStoreAppId);

+ controller_->PinAppWithID(extensions::kWebStoreAppId);

ash::ShelfID id = controller_->GetShelfIDForAppID(

- extension_misc::kWebStoreAppId);

+ extensions::kWebStoreAppId);

ASSERT_NE(0, id);

EXPECT_EQ(ash::STATUS_CLOSED, model_->ItemByID(id)->status);

// Create a windowed application.

AppLaunchParams params(

profile(),

- controller_->GetExtensionForAppID(extension_misc::kWebStoreAppId),

+ controller_->GetExtensionForAppID(extensions::kWebStoreAppId),

chrome::HOST_DESKTOP_TYPE_ASH);

params.container = extensions::LAUNCH_CONTAINER_WINDOW;