OLD | NEW |
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 <memory> |
8 #include <string> | 9 #include <string> |
9 | 10 |
10 #include "base/macros.h" | 11 #include "base/macros.h" |
11 #include "base/memory/scoped_ptr.h" | |
12 #include "base/memory/weak_ptr.h" | 12 #include "base/memory/weak_ptr.h" |
13 #include "base/strings/string16.h" | 13 #include "base/strings/string16.h" |
14 #include "chrome/browser/command_updater.h" | 14 #include "chrome/browser/command_updater.h" |
15 #include "chrome/browser/command_updater_delegate.h" | 15 #include "chrome/browser/command_updater_delegate.h" |
16 #include "chrome/browser/ui/panels/panel_constants.h" | 16 #include "chrome/browser/ui/panels/panel_constants.h" |
17 #include "components/sessions/core/session_id.h" | 17 #include "components/sessions/core/session_id.h" |
18 #include "content/public/browser/notification_observer.h" | 18 #include "content/public/browser/notification_observer.h" |
19 #include "content/public/browser/notification_registrar.h" | 19 #include "content/public/browser/notification_registrar.h" |
20 #include "content/public/browser/web_contents_observer.h" | 20 #include "content/public/browser/web_contents_observer.h" |
21 #include "extensions/browser/extension_registry_observer.h" | 21 #include "extensions/browser/extension_registry_observer.h" |
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
399 AttentionMode attention_mode_; | 399 AttentionMode attention_mode_; |
400 | 400 |
401 ExpansionState expansion_state_; | 401 ExpansionState expansion_state_; |
402 | 402 |
403 // The CommandUpdater manages the window commands. | 403 // The CommandUpdater manages the window commands. |
404 CommandUpdater command_updater_; | 404 CommandUpdater command_updater_; |
405 | 405 |
406 content::NotificationRegistrar registrar_; | 406 content::NotificationRegistrar registrar_; |
407 extensions::ExtensionRegistry* extension_registry_; | 407 extensions::ExtensionRegistry* extension_registry_; |
408 const SessionID session_id_; | 408 const SessionID session_id_; |
409 scoped_ptr<extensions::WindowController> extension_window_controller_; | 409 std::unique_ptr<extensions::WindowController> extension_window_controller_; |
410 scoped_ptr<PanelHost> panel_host_; | 410 std::unique_ptr<PanelHost> panel_host_; |
411 | 411 |
412 // Icon showed in the task bar. | 412 // Icon showed in the task bar. |
413 gfx::Image app_icon_; | 413 gfx::Image app_icon_; |
414 | 414 |
415 scoped_ptr<ScopedKeepAlive> keep_alive_; | 415 std::unique_ptr<ScopedKeepAlive> keep_alive_; |
416 | 416 |
417 base::WeakPtrFactory<Panel> image_loader_ptr_factory_; | 417 base::WeakPtrFactory<Panel> image_loader_ptr_factory_; |
418 | 418 |
419 DISALLOW_COPY_AND_ASSIGN(Panel); | 419 DISALLOW_COPY_AND_ASSIGN(Panel); |
420 }; | 420 }; |
421 | 421 |
422 #endif // CHROME_BROWSER_UI_PANELS_PANEL_H_ | 422 #endif // CHROME_BROWSER_UI_PANELS_PANEL_H_ |
OLD | NEW |