chrome/browser/android/tab_android.h - Issue 983043003: Componentize FaviconService and FaviconHandler

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/android/tab_android.h

Issue 983043003: Componentize FaviconService and FaviconHandler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@favicon_service

Patch Set: Fix android_aosp (reverted the change by mistake by switching computer) Created 5 years, 9 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/android/shortcut_helper.cc ('k') | chrome/browser/bookmarks/bookmark_html_writer.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 #ifndef CHROME_BROWSER_ANDROID_TAB_ANDROID_H_	5 #ifndef CHROME_BROWSER_ANDROID_TAB_ANDROID_H_

6 #define CHROME_BROWSER_ANDROID_TAB_ANDROID_H_	6 #define CHROME_BROWSER_ANDROID_TAB_ANDROID_H_

7	7

8 #include <jni.h>	8 #include <jni.h>

9	9

10 #include "base/android/jni_weak_ref.h"	10 #include "base/android/jni_weak_ref.h"

11 #include "base/callback_forward.h"	11 #include "base/callback_forward.h"

12 #include "base/memory/scoped_ptr.h"	12 #include "base/memory/scoped_ptr.h"

13 #include "base/strings/string16.h"	13 #include "base/strings/string16.h"

14 #include "chrome/browser/favicon/favicon_tab_helper_observer.h"

15 #include "chrome/browser/search/instant_service_observer.h"	14 #include "chrome/browser/search/instant_service_observer.h"

16 #include "chrome/browser/sync/glue/synced_tab_delegate_android.h"	15 #include "chrome/browser/sync/glue/synced_tab_delegate_android.h"

17 #include "chrome/browser/ui/search/search_tab_helper_delegate.h"	16 #include "chrome/browser/ui/search/search_tab_helper_delegate.h"

18 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"	17 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"

19 #include "chrome/browser/ui/toolbar/toolbar_model.h"	18 #include "chrome/browser/ui/toolbar/toolbar_model.h"

	19 #include "components/favicon/core/browser/favicon_tab_helper_observer.h"

20 #include "components/sessions/session_id.h"	20 #include "components/sessions/session_id.h"

21 #include "content/public/browser/notification_observer.h"	21 #include "content/public/browser/notification_observer.h"

22 #include "content/public/browser/notification_registrar.h"	22 #include "content/public/browser/notification_registrar.h"

23	23

24 class GURL;	24 class GURL;

25 class Profile;	25 class Profile;

26 class SkBitmap;	26 class SkBitmap;

27	27

28 namespace cc {	28 namespace cc {

29 class Layer;	29 class Layer;

(...skipping 203 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
233 scoped_ptr<content::WebContents> web_contents_;	233 scoped_ptr<content::WebContents> web_contents_;

234 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid>	234 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid>

235 web_contents_delegate_;	235 web_contents_delegate_;

236	236

237 scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_;	237 scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_;

238	238

239 DISALLOW_COPY_AND_ASSIGN(TabAndroid);	239 DISALLOW_COPY_AND_ASSIGN(TabAndroid);

240 };	240 };

241	241

242 #endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_	242 #endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_

OLD	NEW