Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(622)

Side by Side Diff: chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

Issue 10827404: The password manager infobar is suppressed when the one-click infobar is (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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate. h" 5 #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate. h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 } 336 }
337 } 337 }
338 } 338 }
339 339
340 // See if the response contains the X-Auto-Login header. If so, this was 340 // See if the response contains the X-Auto-Login header. If so, this was
341 // a request for a login page, and the server is allowing the browser to 341 // a request for a login page, and the server is allowing the browser to
342 // suggest auto-login, if available. 342 // suggest auto-login, if available.
343 AutoLoginPrompter::ShowInfoBarIfPossible(request, info->GetChildID(), 343 AutoLoginPrompter::ShowInfoBarIfPossible(request, info->GetChildID(),
344 info->GetRouteID()); 344 info->GetRouteID());
345 345
346 #if defined(ENABLE_ONE_CLICK_SIGNIN)
tim (not reviewing) 2012/08/17 19:43:14 How come we're still using an ifdef for this? Als
Roger Tawa OOO till Jul 10th 2012/08/17 20:09:43 Not all platforms use one-click sign in, like andr
347 // See if the response contains the Google-Accounts-SignIn header. If so,
348 // then the user has just finished signing in, and the server is allowing the
349 // browser to suggest connecting the user's profile to the account.
350 OneClickSigninHelper::ShowInfoBarIfPossible(request, info->GetChildID(),
351 info->GetRouteID());
352 #endif
353
346 ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context); 354 ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context);
347 if (io_data->resource_prefetch_predictor_observer()) 355 if (io_data->resource_prefetch_predictor_observer())
348 io_data->resource_prefetch_predictor_observer()->OnResponseStarted(request); 356 io_data->resource_prefetch_predictor_observer()->OnResponseStarted(request);
349 } 357 }
350 358
351 void ChromeResourceDispatcherHostDelegate::OnRequestRedirected( 359 void ChromeResourceDispatcherHostDelegate::OnRequestRedirected(
352 const GURL& redirect_url, 360 const GURL& redirect_url,
353 net::URLRequest* request, 361 net::URLRequest* request,
354 content::ResourceContext* resource_context, 362 content::ResourceContext* resource_context,
355 content::ResourceResponse* response) { 363 content::ResourceResponse* response) {
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 if (base::Base64Encode(serialized, &hashed)) { 432 if (base::Base64Encode(serialized, &hashed)) {
425 // If successful, swap the header value with the new one. 433 // If successful, swap the header value with the new one.
426 // Note that the list of IDs and the header could be temporarily out of sync 434 // Note that the list of IDs and the header could be temporarily out of sync
427 // if IDs are added as we are recreating the header, but we're OK with those 435 // if IDs are added as we are recreating the header, but we're OK with those
428 // descrepancies. 436 // descrepancies.
429 variation_ids_header_ = hashed; 437 variation_ids_header_ = hashed;
430 } else { 438 } else {
431 DVLOG(1) << "Failed to base64 encode Variation IDs value: " << serialized; 439 DVLOG(1) << "Failed to base64 encode Variation IDs value: " << serialized;
432 } 440 }
433 } 441 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698