components/sessions/content/content_platform_specific_tab_data.h - Issue 2088443003: Shortcut ctrl+shift+T added on android.

Side by Side Diff: components/sessions/content/content_platform_specific_tab_data.h

Issue 2088443003: Shortcut ctrl+shift+T added on android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix issues based on feedback. Created 4 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

« no previous file with comments | « chrome/browser/ui/android/tab_model/tab_model_jni_bridge.cc ('k') | components/sessions/content/content_platform_specific_tab_data.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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 #ifndef COMPONENTS_SESSIONS_CONTENT_CONTENT_PLATFORM_SPECIFIC_TAB_DATA_H_	5 #ifndef COMPONENTS_SESSIONS_CONTENT_CONTENT_PLATFORM_SPECIFIC_TAB_DATA_H_

6 #define COMPONENTS_SESSIONS_CONTENT_CONTENT_PLATFORM_SPECIFIC_TAB_DATA_H_	6 #define COMPONENTS_SESSIONS_CONTENT_CONTENT_PLATFORM_SPECIFIC_TAB_DATA_H_

7	7

8 #include "base/memory/ref_counted.h"	8 #include "base/memory/ref_counted.h"

9 #include "components/sessions/core/live_tab.h"	9 #include "components/sessions/core/live_tab.h"

10 #include "components/sessions/core/sessions_export.h"	10 #include "components/sessions/core/sessions_export.h"

(...skipping 13 matching lines...) Expand all Loading...
24 : public PlatformSpecificTabData {	24 : public PlatformSpecificTabData {

25 public:	25 public:

26 explicit ContentPlatformSpecificTabData(content::WebContents* web_contents);	26 explicit ContentPlatformSpecificTabData(content::WebContents* web_contents);

27 ContentPlatformSpecificTabData();	27 ContentPlatformSpecificTabData();

28 ~ContentPlatformSpecificTabData() override;	28 ~ContentPlatformSpecificTabData() override;

29	29

30 content::SessionStorageNamespace* session_storage_namespace() const {	30 content::SessionStorageNamespace* session_storage_namespace() const {

31 return session_storage_namespace_.get();	31 return session_storage_namespace_.get();

32 }	32 }

33	33

	34 SessionID::id_type window_id() const {

	35 return window_id_;
	sky 2016/06/24 15:54:22 Can you elaborate on why you need to add this here Can you elaborate on why you need to add this here? In general I would prefer to keep this class at just the parts needed by session restore. AFAICT the window_id_ isn't generally needed by components/session. I you need to associated arbitrary data with WebContents, use SupportsUserData. xingliu 2016/06/24 16:48:44 Thank you for the feedback, The window_id here is Show quoted text On 2016/06/24 15:54:22, sky wrote: > Can you elaborate on why you need to add this here? In general I would prefer to > keep this class at just the parts needed by session restore. AFAICT the > window_id_ isn't generally needed by components/session. I you need to > associated arbitrary data with WebContents, use SupportsUserData. Thank you for the feedback, The window_id here is used by android chrome to write the window id into TabRestoreService::Tab. So during restoring, it can find the correct window. TabRestoreService::Tab.browser_id is not used by android since LiveTabContext is bypassed. The place where Tab.browser_id is bypassed on android is TabRestoreServiceHelper::PopulateTab line 383. The reason to read window id from TabRestoreService::Tab is that we're trying to restore a tab when no parent tab context is given, so it can't find the window id or browser id from WebContents in any existing tab. xingliu 2016/06/24 17:52:29 Or I can add function to access TabRestoreService: Show quoted text On 2016/06/24 15:54:22, sky wrote: > Can you elaborate on why you need to add this here? In general I would prefer to > keep this class at just the parts needed by session restore. AFAICT the > window_id_ isn't generally needed by components/session. I you need to > associated arbitrary data with WebContents, use SupportsUserData. Or I can add function to access TabRestoreService::Tab entry from external class to write the window id into TabRestoreService::Tab.browser_id, if this makes more sense.
	36 }

	37

	38 void SetWindowId(SessionID::id_type id) {
	sky 2016/06/24 15:54:22 set_window_id set_window_id xingliu 2016/06/24 16:48:44 Will be fixed shortly. Show quoted text On 2016/06/24 15:54:22, sky wrote: > set_window_id Will be fixed shortly.
	39 window_id_ = id;

	40 }

	41

34 private:	42 private:

35 // PlatformSpecificTabData:	43 // PlatformSpecificTabData:

36 std::unique_ptr<PlatformSpecificTabData> Clone() override;	44 std::unique_ptr<PlatformSpecificTabData> Clone() override;

37	45

38 scoped_refptr<content::SessionStorageNamespace> session_storage_namespace_;	46 scoped_refptr<content::SessionStorageNamespace> session_storage_namespace_;

	47

	48 // used to match android tab model id.

	49 SessionID::id_type window_id_;
	sky 2016/06/24 15:54:22 This needs to be initialized in the member initial This needs to be initialized in the member initialize list. xingliu 2016/06/24 16:48:44 Will be fixed shortly. Show quoted text On 2016/06/24 15:54:22, sky wrote: > This needs to be initialized in the member initialize list. Will be fixed shortly.
39 };	50 };

40	51

41 } // namespace sessions	52 } // namespace sessions

42	53

43 #endif // COMPONENTS_SESSIONS_CONTENT_CONTENT_PLATFORM_SPECIFIC_TAB_DATA_H_	54 #endif // COMPONENTS_SESSIONS_CONTENT_CONTENT_PLATFORM_SPECIFIC_TAB_DATA_H_

OLD	NEW