chrome/browser/extensions/api/extension_action/extension_action_api.cc - Issue 48853005: Remove ExtensionToolbarModel from ExtensionService.

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

Unified Diff: chrome/browser/extensions/api/extension_action/extension_action_api.cc

Issue 48853005: Remove ExtensionToolbarModel from ExtensionService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Compile after rebase Created 7 years, 1 month 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/api/extension_action/browser_action_apitest.cc ('k') | chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/extension_action/extension_action_api.cc

diff --git a/chrome/browser/extensions/api/extension_action/extension_action_api.cc b/chrome/browser/extensions/api/extension_action/extension_action_api.cc

index 470af859b66138a39674e0bc35bd75d2e6d7677d..9eb0c63ec07567bd462ea1eecd944b8d2ae1a736 100644

--- a/chrome/browser/extensions/api/extension_action/extension_action_api.cc

+++ b/chrome/browser/extensions/api/extension_action/extension_action_api.cc

@@ -19,6 +19,7 @@

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/extensions/extension_system.h"

#include "chrome/browser/extensions/extension_tab_util.h"

+#include "chrome/browser/extensions/extension_toolbar_model.h"

#include "chrome/browser/extensions/location_bar_controller.h"

#include "chrome/browser/extensions/state_store.h"

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

@@ -819,9 +820,7 @@ BrowserActionOpenPopupFunction::BrowserActionOpenPopupFunction()

}

bool BrowserActionOpenPopupFunction::RunImpl() {

- ExtensionToolbarModel* model = extensions::ExtensionSystem::Get(GetProfile())

- ->extension_service()

- ->toolbar_model();

+ ExtensionToolbarModel* model = ExtensionToolbarModel::Get(GetProfile());

if (!model) {

error_ = kInternalError;

return false;