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

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: fix findbugs warning 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 757 matching lines...) Expand 10 before | Expand all | Expand 10 after
768 entry->SetIsOverridingUserAgent(override); 768 entry->SetIsOverridingUserAgent(override);
769 entry->set_transferred_global_request_id( 769 entry->set_transferred_global_request_id(
770 params.transferred_global_request_id); 770 params.transferred_global_request_id);
771 771
772 #if defined(OS_ANDROID) 772 #if defined(OS_ANDROID)
773 if (params.intent_received_timestamp > 0) { 773 if (params.intent_received_timestamp > 0) {
774 entry->set_intent_received_timestamp( 774 entry->set_intent_received_timestamp(
775 base::TimeTicks() + 775 base::TimeTicks() +
776 base::TimeDelta::FromMilliseconds(params.intent_received_timestamp)); 776 base::TimeDelta::FromMilliseconds(params.intent_received_timestamp));
777 } 777 }
778 entry->set_has_user_gesture(params.has_user_gesture);
778 #endif 779 #endif
779 780
780 switch (params.load_type) { 781 switch (params.load_type) {
781 case LOAD_TYPE_DEFAULT: 782 case LOAD_TYPE_DEFAULT:
782 break; 783 break;
783 case LOAD_TYPE_BROWSER_INITIATED_HTTP_POST: 784 case LOAD_TYPE_BROWSER_INITIATED_HTTP_POST:
784 entry->SetHasPostData(true); 785 entry->SetHasPostData(true);
785 entry->SetBrowserInitiatedPostData( 786 entry->SetBrowserInitiatedPostData(
786 params.browser_initiated_post_data.get()); 787 params.browser_initiated_post_data.get());
787 break; 788 break;
(...skipping 1195 matching lines...) Expand 10 before | Expand all | Expand 10 after
1983 } 1984 }
1984 } 1985 }
1985 } 1986 }
1986 1987
1987 void NavigationControllerImpl::SetGetTimestampCallbackForTest( 1988 void NavigationControllerImpl::SetGetTimestampCallbackForTest(
1988 const base::Callback<base::Time()>& get_timestamp_callback) { 1989 const base::Callback<base::Time()>& get_timestamp_callback) {
1989 get_timestamp_callback_ = get_timestamp_callback; 1990 get_timestamp_callback_ = get_timestamp_callback;
1990 } 1991 }
1991 1992
1992 } // namespace content 1993 } // namespace content
OLDNEW
« no previous file with comments | « chrome/browser/android/tab_android.cc ('k') | content/browser/frame_host/navigation_entry_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698