ui/app_list/cocoa/apps_search_results_model_bridge.h - Issue 17593006: mac: Update clients of scoped_nsobject.h.

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: ui/app_list/cocoa/apps_search_results_model_bridge.h

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: iwyu, scoped_nsprotocol Created 7 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:

Index: ui/app_list/cocoa/apps_search_results_model_bridge.h

diff --git a/ui/app_list/cocoa/apps_search_results_model_bridge.h b/ui/app_list/cocoa/apps_search_results_model_bridge.h

index f689890f50c03b0f986df50490a57919f766879b..3f408623c704c04ab9e551ef547af583135ee2a3 100644

--- a/ui/app_list/cocoa/apps_search_results_model_bridge.h

+++ b/ui/app_list/cocoa/apps_search_results_model_bridge.h

@@ -5,7 +5,7 @@

#ifndef UI_APP_LIST_COCOA_APPS_SEARCH_RESULTS_MODEL_BRIDGE_H_

#define UI_APP_LIST_COCOA_APPS_SEARCH_RESULTS_MODEL_BRIDGE_H_

-#include "base/memory/scoped_nsobject.h"

+#include "base/mac/scoped_nsobject.h"

#include "base/memory/scoped_vector.h"

#include "ui/app_list/app_list_model.h"

#include "ui/base/models/list_model_observer.h"

@@ -36,7 +36,7 @@ class AppsSearchResultsModelBridge : public ui::ListModelObserver {

virtual void ListItemsChanged(size_t start, size_t count) OVERRIDE;

AppListModel::SearchResults* results_; // Weak. Owned by AppListModel.

- scoped_nsobject<NSTableView> table_view_;

+ base::scoped_nsobject<NSTableView> table_view_;

ScopedVector<ItemObserver> item_observers_;

DISALLOW_COPY_AND_ASSIGN(AppsSearchResultsModelBridge);