| 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_VIEWS_AURA_PANEL_VIEW_AURA_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_ASH_PANEL_VIEW_AURA_H_ | 
| 6 #define CHROME_BROWSER_UI_VIEWS_AURA_PANEL_VIEW_AURA_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_ASH_PANEL_VIEW_AURA_H_ | 
| 7 #pragma once | 7 #pragma once | 
| 8 | 8 | 
| 9 #include <string> | 9 #include <string> | 
| 10 | 10 | 
| 11 #include "base/basictypes.h" | 11 #include "base/basictypes.h" | 
| 12 #include "chrome/browser/sessions/session_id.h" | 12 #include "chrome/browser/sessions/session_id.h" | 
| 13 #include "chrome/browser/ui/base_window.h" | 13 #include "chrome/browser/ui/base_window.h" | 
| 14 #include "ui/gfx/size.h" | 14 #include "ui/gfx/size.h" | 
| 15 #include "ui/views/controls/native/native_view_host.h" | 15 #include "ui/views/controls/native/native_view_host.h" | 
| 16 #include "ui/views/widget/widget_delegate.h" | 16 #include "ui/views/widget/widget_delegate.h" | 
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 95   gfx::Size preferred_size_; | 95   gfx::Size preferred_size_; | 
| 96   // Owned internal host class implementing WebContents and Extension Delegates. | 96   // Owned internal host class implementing WebContents and Extension Delegates. | 
| 97   scoped_ptr<internal::PanelHost> host_; | 97   scoped_ptr<internal::PanelHost> host_; | 
| 98   // Unowned pointer to the widget. | 98   // Unowned pointer to the widget. | 
| 99   views::Widget* widget_; | 99   views::Widget* widget_; | 
| 100   scoped_ptr<ExtensionWindowController> extension_window_controller_; | 100   scoped_ptr<ExtensionWindowController> extension_window_controller_; | 
| 101 | 101 | 
| 102   DISALLOW_COPY_AND_ASSIGN(PanelViewAura); | 102   DISALLOW_COPY_AND_ASSIGN(PanelViewAura); | 
| 103 }; | 103 }; | 
| 104 | 104 | 
| 105 #endif  // CHROME_BROWSER_UI_VIEWS_AURA_PANEL_VIEW_AURA_H_ | 105 #endif  // CHROME_BROWSER_UI_VIEWS_ASH_PANEL_VIEW_AURA_H_ | 
| OLD | NEW | 
|---|