chrome/browser/ui/sync/tab_contents_synced_tab_delegate.cc - Issue 12298037: Revert 183123

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/sync/tab_contents_synced_tab_delegate.cc

Issue 12298037: Revert 183123 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1417/src/

Patch Set: Created 7 years, 10 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 | « chrome/browser/ui/omnibox/omnibox_view_unittest.cc ('k') | chrome/browser/ui/tabs/tab_strip_model.cc » ('j') | no next file with comments »

OLD	NEW
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/sync/tab_contents_synced_tab_delegate.h"	5 #include "chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h"

6	6

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

8 #include "chrome/browser/extensions/tab_helper.h"	8 #include "chrome/browser/extensions/tab_helper.h"

9 #include "chrome/browser/profiles/profile.h"

10 #include "chrome/browser/sessions/session_tab_helper.h"	9 #include "chrome/browser/sessions/session_tab_helper.h"

11 #include "chrome/browser/sync/glue/synced_window_delegate.h"	10 #include "chrome/browser/sync/glue/synced_window_delegate.h"

12 #include "chrome/common/extensions/extension.h"	11 #include "chrome/common/extensions/extension.h"

13 #include "content/public/browser/navigation_controller.h"	12 #include "content/public/browser/navigation_controller.h"

14 #include "content/public/browser/navigation_entry.h"	13 #include "content/public/browser/navigation_entry.h"

15 #include "content/public/browser/web_contents.h"	14 #include "content/public/browser/web_contents.h"

16	15

17 using content::NavigationEntry;	16 using content::NavigationEntry;

18	17

19 DEFINE_WEB_CONTENTS_USER_DATA_KEY(TabContentsSyncedTabDelegate);	18 DEFINE_WEB_CONTENTS_USER_DATA_KEY(TabContentsSyncedTabDelegate);

(...skipping 50 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
70 return web_contents_->GetController().GetActiveEntry();	69 return web_contents_->GetController().GetActiveEntry();

71 }	70 }

72	71

73 bool TabContentsSyncedTabDelegate::IsPinned() const {	72 bool TabContentsSyncedTabDelegate::IsPinned() const {

74 const browser_sync::SyncedWindowDelegate* window =	73 const browser_sync::SyncedWindowDelegate* window =

75 browser_sync::SyncedWindowDelegate::FindSyncedWindowDelegateWithId(	74 browser_sync::SyncedWindowDelegate::FindSyncedWindowDelegateWithId(

76 GetWindowId());	75 GetWindowId());

77 // We might not have a parent window, e.g. Developer Tools.	76 // We might not have a parent window, e.g. Developer Tools.

78 return window ? window->IsTabPinned(this) : false;	77 return window ? window->IsTabPinned(this) : false;

79 }	78 }

OLD	NEW