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

Side by Side Diff: chrome/browser/ui/panels/panel.h

Issue 1376063005: Cleanup: Pull some browser keep alive functions into its own file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 2 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/browser.cc ('k') | chrome/browser/ui/panels/panel.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_UI_PANELS_PANEL_H_ 5 #ifndef CHROME_BROWSER_UI_PANELS_PANEL_H_
6 #define CHROME_BROWSER_UI_PANELS_PANEL_H_ 6 #define CHROME_BROWSER_UI_PANELS_PANEL_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 12 matching lines...) Expand all
23 #include "ui/gfx/image/image.h" 23 #include "ui/gfx/image/image.h"
24 24
25 class GURL; 25 class GURL;
26 class NativePanel; 26 class NativePanel;
27 class PanelCollection; 27 class PanelCollection;
28 class PanelHost; 28 class PanelHost;
29 class PanelManager; 29 class PanelManager;
30 class Profile; 30 class Profile;
31 class StackedPanelCollection; 31 class StackedPanelCollection;
32 32
33 namespace browser_lifetime {
34 class ScopedKeepAlive;
35 }
36
33 namespace content { 37 namespace content {
34 class WebContents; 38 class WebContents;
35 struct NativeWebKeyboardEvent; 39 struct NativeWebKeyboardEvent;
36 } 40 }
37 41
38 namespace extensions { 42 namespace extensions {
39 class Extension; 43 class Extension;
40 class ExtensionRegistry; 44 class ExtensionRegistry;
41 class WindowController; 45 class WindowController;
42 } 46 }
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 400
397 // The CommandUpdater manages the window commands. 401 // The CommandUpdater manages the window commands.
398 CommandUpdater command_updater_; 402 CommandUpdater command_updater_;
399 403
400 content::NotificationRegistrar registrar_; 404 content::NotificationRegistrar registrar_;
401 extensions::ExtensionRegistry* extension_registry_; 405 extensions::ExtensionRegistry* extension_registry_;
402 const SessionID session_id_; 406 const SessionID session_id_;
403 scoped_ptr<extensions::WindowController> extension_window_controller_; 407 scoped_ptr<extensions::WindowController> extension_window_controller_;
404 scoped_ptr<PanelHost> panel_host_; 408 scoped_ptr<PanelHost> panel_host_;
405 409
410 #if !defined(USE_AURA)
411 scoped_ptr<browser_lifetime::ScopedKeepAlive> keep_alive_;
412 #endif
413
406 // Icon showed in the task bar. 414 // Icon showed in the task bar.
407 gfx::Image app_icon_; 415 gfx::Image app_icon_;
408 416
409 base::WeakPtrFactory<Panel> image_loader_ptr_factory_; 417 base::WeakPtrFactory<Panel> image_loader_ptr_factory_;
410 418
411 DISALLOW_COPY_AND_ASSIGN(Panel); 419 DISALLOW_COPY_AND_ASSIGN(Panel);
412 }; 420 };
413 421
414 #endif // CHROME_BROWSER_UI_PANELS_PANEL_H_ 422 #endif // CHROME_BROWSER_UI_PANELS_PANEL_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/panels/panel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698