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

Side by Side Diff: chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc

Issue 1194383003: Add a flag showing whether the current request was ignored by a handler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix trybot failures (DidFailProvisionalLoad calls in unit tests) Created 5 years, 6 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
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/ui/webui/chromeos/mobile_setup_ui.h" 5 #include "chrome/browser/ui/webui/chromeos/mobile_setup_ui.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after
633 return; 633 return;
634 634
635 web_ui()->CallJavascriptFunction( 635 web_ui()->CallJavascriptFunction(
636 kJsPortalFrameLoadCompletedCallback); 636 kJsPortalFrameLoadCompletedCallback);
637 } 637 }
638 638
639 void MobileSetupUI::DidFailProvisionalLoad( 639 void MobileSetupUI::DidFailProvisionalLoad(
640 content::RenderFrameHost* render_frame_host, 640 content::RenderFrameHost* render_frame_host,
641 const GURL& validated_url, 641 const GURL& validated_url,
642 int error_code, 642 int error_code,
643 const base::string16& error_description) { 643 const base::string16& error_description,
644 bool was_ignored_by_handler) {
644 if (render_frame_host->GetFrameName() != "paymentForm") 645 if (render_frame_host->GetFrameName() != "paymentForm")
645 return; 646 return;
646 647
647 base::FundamentalValue result_value(-error_code); 648 base::FundamentalValue result_value(-error_code);
648 web_ui()->CallJavascriptFunction(kJsPortalFrameLoadFailedCallback, 649 web_ui()->CallJavascriptFunction(kJsPortalFrameLoadFailedCallback,
649 result_value); 650 result_value);
650 } 651 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/mobile_setup_ui.h ('k') | chrome/test/base/in_process_browser_test_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698