chrome/browser/ui/search_engines/template_url_table_model.cc - 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/ui/search_engines/template_url_table_model.cc

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/ui/cocoa/history_menu_bridge.h ('k') | chrome/browser/ui/toolbar/back_forward_menu_model.h » ('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/search_engines/template_url_table_model.h"	5 #include "chrome/browser/ui/search_engines/template_url_table_model.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/i18n/rtl.h"	8 #include "base/i18n/rtl.h"

9 #include "base/task/cancelable_task_tracker.h"	9 #include "base/task/cancelable_task_tracker.h"

10 #include "chrome/browser/favicon/favicon_service.h"

11 #include "chrome/grit/generated_resources.h"	10 #include "chrome/grit/generated_resources.h"

	11 #include "components/favicon/core/browser/favicon_service.h"

12 #include "components/favicon_base/favicon_types.h"	12 #include "components/favicon_base/favicon_types.h"

13 #include "components/search_engines/template_url.h"	13 #include "components/search_engines/template_url.h"

14 #include "components/search_engines/template_url_service.h"	14 #include "components/search_engines/template_url_service.h"

15 #include "ui/base/l10n/l10n_util.h"	15 #include "ui/base/l10n/l10n_util.h"

16 #include "ui/base/models/table_model_observer.h"	16 #include "ui/base/models/table_model_observer.h"

17 #include "ui/base/resource/resource_bundle.h"	17 #include "ui/base/resource/resource_bundle.h"

18 #include "ui/gfx/image/image_skia.h"	18 #include "ui/gfx/image/image_skia.h"

19 #include "ui/resources/grit/ui_resources.h"	19 #include "ui/resources/grit/ui_resources.h"

20	20

21 // Group IDs used by TemplateURLTableModel.	21 // Group IDs used by TemplateURLTableModel.

(...skipping 361 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
383 return entry.Pass();	383 return entry.Pass();

384 }	384 }

385	385

386 void TemplateURLTableModel::AddEntry(int index, scoped_ptr<ModelEntry> entry) {	386 void TemplateURLTableModel::AddEntry(int index, scoped_ptr<ModelEntry> entry) {

387 entries_.insert(entries_.begin() + index, entry.release());	387 entries_.insert(entries_.begin() + index, entry.release());

388 if (index <= last_other_engine_index_)	388 if (index <= last_other_engine_index_)

389 ++last_other_engine_index_;	389 ++last_other_engine_index_;

390 if (observer_)	390 if (observer_)

391 observer_->OnItemsAdded(index, 1);	391 observer_->OnItemsAdded(index, 1);

392 }	392 }

OLD	NEW