chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc - Issue 118733002: Added merge session request throttle for XHR requests

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

Issue 118733002: Added merge session request throttle for XHR requests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years 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/chrome_launcher_controller.cc

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

index d80e3d8754af1017546ad750cbb7d02435de3514..65974671f93a187c6b0c6ded095fbd51268d0d2b 100644

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

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

@@ -106,7 +106,7 @@ namespace {

// This will be used as placeholder in the list of the pinned applciatons.

// Note that this is NOT a valid extension identifier so that pre M31 versions

// will ignore it.

-const char kAppLauncherIdPlaceholder[] = "AppLauncherIDPlaceholder--------";

+const char kAppLauncherIdPlaceholder[] = "AppLauncherIDPlaceholder-------x";

xiyuan 2013/12/19 01:45:41 We don't want to check in this. It is a temp work

zel 2013/12/19 23:28:02 Done.

std::string GetPrefKeyForRootWindow(aura::Window* root_window) {

gfx::Display display = gfx::Screen::GetScreenFor(