Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(45)

Side by Side Diff: chrome/browser/extensions/tab_helper.h

Issue 11886084: Revert 177235 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 11 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 | Annotate | Revision Log
Property Changes:
Added: svn:mergeinfo
OLDNEW
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_EXTENSIONS_TAB_HELPER_H_ 5 #ifndef CHROME_BROWSER_EXTENSIONS_TAB_HELPER_H_
6 #define CHROME_BROWSER_EXTENSIONS_TAB_HELPER_H_ 6 #define CHROME_BROWSER_EXTENSIONS_TAB_HELPER_H_
7 7
8 #include <map>
9 #include <string>
10 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
11 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
12 #include "base/observer_list.h" 10 #include "base/observer_list.h"
13 #include "chrome/browser/extensions/active_tab_permission_granter.h" 11 #include "chrome/browser/extensions/active_tab_permission_granter.h"
14 #include "chrome/browser/extensions/app_notify_channel_setup.h" 12 #include "chrome/browser/extensions/app_notify_channel_setup.h"
15 #include "chrome/browser/extensions/extension_function_dispatcher.h" 13 #include "chrome/browser/extensions/extension_function_dispatcher.h"
16 #include "chrome/browser/extensions/image_loading_tracker.h" 14 #include "chrome/browser/extensions/image_loading_tracker.h"
17 #include "chrome/common/web_apps.h" 15 #include "chrome/common/web_apps.h"
18 #include "content/public/browser/notification_observer.h" 16 #include "content/public/browser/notification_observer.h"
19 #include "content/public/browser/notification_registrar.h" 17 #include "content/public/browser/notification_registrar.h"
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 content::NotificationRegistrar registrar_; 258 content::NotificationRegistrar registrar_;
261 259
262 scoped_ptr<ScriptExecutor> script_executor_; 260 scoped_ptr<ScriptExecutor> script_executor_;
263 261
264 scoped_ptr<LocationBarController> location_bar_controller_; 262 scoped_ptr<LocationBarController> location_bar_controller_;
265 263
266 scoped_ptr<ActiveTabPermissionGranter> active_tab_permission_granter_; 264 scoped_ptr<ActiveTabPermissionGranter> active_tab_permission_granter_;
267 265
268 scoped_ptr<ScriptBubbleController> script_bubble_controller_; 266 scoped_ptr<ScriptBubbleController> script_bubble_controller_;
269 267
270 Profile* profile_;
271
272 DISALLOW_COPY_AND_ASSIGN(TabHelper); 268 DISALLOW_COPY_AND_ASSIGN(TabHelper);
273 }; 269 };
274 270
275 } // namespace extensions 271 } // namespace extensions
276 272
277 #endif // CHROME_BROWSER_EXTENSIONS_TAB_HELPER_H_ 273 #endif // CHROME_BROWSER_EXTENSIONS_TAB_HELPER_H_
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_function_dispatcher.cc ('k') | chrome/browser/extensions/tab_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698