Added merge session request throttle for XHR requests

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

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/desktop_background/desktop_background_controller.h"
@@ skipping 88 matching lines @@
 using content::WebContents;
 
 // static
 ChromeLauncherController* ChromeLauncherController::instance_ = NULL;
 
 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 around. Stefan has a proper
fix landing (https://codereview.chromium.org/98283004/).

[zel, 2013/12/19 23:28:02]

Done.

 
 std::string GetPrefKeyForRootWindow(aura::Window* root_window) {
   gfx::Display display = gfx::Screen::GetScreenFor(
       root_window)->GetDisplayNearestWindow(root_window);
   DCHECK(display.is_valid());
 
   return base::Int64ToString(display.id());
 }
 
 void UpdatePerDisplayPref(PrefService* pref_service,
@@ skipping 1895 matching lines @@
 }
 
 void ChromeLauncherController::ReleaseProfile() {
   if (app_sync_ui_state_)
     app_sync_ui_state_->RemoveObserver(this);
 
   PrefServiceSyncable::FromProfile(profile_)->RemoveObserver(this);
 
   pref_change_registrar_.RemoveAll();
 }