chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h - Issue 2281743002: arc: Add support of default and OEM apps.

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/ui/ash/launcher/chrome_launcher_controller_impl.h

Issue 2281743002: arc: Add support of default and OEM apps. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 4 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: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h

diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h

index d3007c6c4b2bedf325f07f07aeb14e13206a9931..db25a073fa46b17e03811a21cc5f88a580856eb4 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h

@@ -14,6 +14,7 @@

#include "ash/display/window_tree_host_manager.h"

#include "base/compiler_specific.h"

#include "base/macros.h"

+#include "base/memory/weak_ptr.h"

#include "build/build_config.h"

#include "chrome/browser/ui/app_icon_loader.h"

#include "chrome/browser/ui/app_list/app_list_syncable_service.h"

@@ -357,6 +358,8 @@ class ChromeLauncherControllerImpl

typedef std::map<std::string, RunningAppListIds> RunningAppListIdMap;

RunningAppListIdMap last_used_running_application_order_;

+ base::WeakPtrFactory<ChromeLauncherControllerImpl> weak_ptr_factory_;

khmel 2016/08/25 22:06:08 To fix crashes in unit tests and possible crash in

DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerImpl);

};