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

Side by Side Diff: content/browser/frame_host/navigation_controller_impl.cc

Issue 1243253004: Pass user gesture bit when chrome handles an intent fired by itself (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: using token to verify intent from chrome Created 5 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 /* 5 /*
6 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 6 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
7 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 7 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
9 * (http://www.torchmobile.com/) 9 * (http://www.torchmobile.com/)
10 * 10 *
(...skipping 758 matching lines...) Expand 10 before | Expand all | Expand 10 after
769 entry->SetIsOverridingUserAgent(override); 769 entry->SetIsOverridingUserAgent(override);
770 entry->set_transferred_global_request_id( 770 entry->set_transferred_global_request_id(
771 params.transferred_global_request_id); 771 params.transferred_global_request_id);
772 772
773 #if defined(OS_ANDROID) 773 #if defined(OS_ANDROID)
774 if (params.intent_received_timestamp > 0) { 774 if (params.intent_received_timestamp > 0) {
775 entry->set_intent_received_timestamp( 775 entry->set_intent_received_timestamp(
776 base::TimeTicks() + 776 base::TimeTicks() +
777 base::TimeDelta::FromMilliseconds(params.intent_received_timestamp)); 777 base::TimeDelta::FromMilliseconds(params.intent_received_timestamp));
778 } 778 }
779 entry->set_has_user_gesture(params.has_user_gesture);
779 #endif 780 #endif
780 781
781 switch (params.load_type) { 782 switch (params.load_type) {
782 case LOAD_TYPE_DEFAULT: 783 case LOAD_TYPE_DEFAULT:
783 break; 784 break;
784 case LOAD_TYPE_BROWSER_INITIATED_HTTP_POST: 785 case LOAD_TYPE_BROWSER_INITIATED_HTTP_POST:
785 entry->SetHasPostData(true); 786 entry->SetHasPostData(true);
786 entry->SetBrowserInitiatedPostData( 787 entry->SetBrowserInitiatedPostData(
787 params.browser_initiated_post_data.get()); 788 params.browser_initiated_post_data.get());
788 break; 789 break;
(...skipping 1195 matching lines...) Expand 10 before | Expand all | Expand 10 after
1984 } 1985 }
1985 } 1986 }
1986 } 1987 }
1987 1988
1988 void NavigationControllerImpl::SetGetTimestampCallbackForTest( 1989 void NavigationControllerImpl::SetGetTimestampCallbackForTest(
1989 const base::Callback<base::Time()>& get_timestamp_callback) { 1990 const base::Callback<base::Time()>& get_timestamp_callback) {
1990 get_timestamp_callback_ = get_timestamp_callback; 1991 get_timestamp_callback_ = get_timestamp_callback;
1991 } 1992 }
1992 1993
1993 } // namespace content 1994 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698