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 #include "chrome/browser/ui/views/ash/panel_view_aura.h" | 5 #include "chrome/browser/ui/views/ash/panel_view_aura.h" |
6 | 6 |
7 #include "ash/wm/panel_frame_view.h" | 7 #include "ash/wm/panel_frame_view.h" |
8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
9 #include "chrome/browser/extensions/api/tabs/tabs_constants.h" | 9 #include "chrome/browser/extensions/api/tabs/tabs_constants.h" |
10 #include "chrome/browser/extensions/extension_function_dispatcher.h" | 10 #include "chrome/browser/extensions/extension_function_dispatcher.h" |
11 #include "chrome/browser/extensions/extension_process_manager.h" | 11 #include "chrome/browser/extensions/extension_process_manager.h" |
12 #include "chrome/browser/extensions/extension_system.h" | 12 #include "chrome/browser/extensions/extension_system.h" |
13 #include "chrome/browser/extensions/extension_tab_util.h" | 13 #include "chrome/browser/extensions/extension_tab_util.h" |
14 #include "chrome/browser/extensions/extension_window_controller.h" | 14 #include "chrome/browser/extensions/extension_window_controller.h" |
15 #include "chrome/browser/extensions/extension_window_list.h" | 15 #include "chrome/browser/extensions/extension_window_list.h" |
16 #include "chrome/browser/profiles/profile.h" | 16 #include "chrome/browser/profiles/profile.h" |
17 #include "chrome/browser/sessions/session_id.h" | 17 #include "chrome/browser/sessions/session_id.h" |
18 #include "chrome/browser/ui/browser.h" | 18 #include "chrome/browser/ui/browser.h" |
19 #include "chrome/browser/ui/browser_finder.h" | 19 #include "chrome/browser/ui/browser_finder.h" |
| 20 #include "chrome/browser/ui/browser_tabstrip.h" |
20 #include "chrome/browser/view_type_utils.h" | 21 #include "chrome/browser/view_type_utils.h" |
21 #include "chrome/common/extensions/extension.h" | 22 #include "chrome/common/extensions/extension.h" |
22 #include "chrome/common/extensions/extension_messages.h" | 23 #include "chrome/common/extensions/extension_messages.h" |
23 #include "content/public/browser/site_instance.h" | 24 #include "content/public/browser/site_instance.h" |
24 #include "content/public/browser/web_contents.h" | 25 #include "content/public/browser/web_contents.h" |
25 #include "content/public/browser/web_contents_delegate.h" | 26 #include "content/public/browser/web_contents_delegate.h" |
26 #include "content/public/browser/web_contents_observer.h" | 27 #include "content/public/browser/web_contents_observer.h" |
27 #include "googleurl/src/gurl.h" | 28 #include "googleurl/src/gurl.h" |
28 #include "ipc/ipc_message.h" | 29 #include "ipc/ipc_message.h" |
29 #include "ipc/ipc_message_macros.h" | 30 #include "ipc/ipc_message_macros.h" |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
138 // This handles launching a new page from within the panel. | 139 // This handles launching a new page from within the panel. |
139 // TODO(stevenjb): Determine whether or not this is the desired/expected | 140 // TODO(stevenjb): Determine whether or not this is the desired/expected |
140 // behavior for panels. | 141 // behavior for panels. |
141 void PanelHost::AddNewContents(content::WebContents* source, | 142 void PanelHost::AddNewContents(content::WebContents* source, |
142 content::WebContents* new_contents, | 143 content::WebContents* new_contents, |
143 WindowOpenDisposition disposition, | 144 WindowOpenDisposition disposition, |
144 const gfx::Rect& initial_pos, | 145 const gfx::Rect& initial_pos, |
145 bool user_gesture) { | 146 bool user_gesture) { |
146 Browser* browser = browser::FindLastActiveWithProfile( | 147 Browser* browser = browser::FindLastActiveWithProfile( |
147 Profile::FromBrowserContext(new_contents->GetBrowserContext())); | 148 Profile::FromBrowserContext(new_contents->GetBrowserContext())); |
148 if (!browser) | 149 if (browser) { |
149 return; | 150 chrome::AddWebContents(browser, NULL, new_contents, disposition, |
150 browser->AddWebContents(new_contents, disposition, initial_pos, user_gesture); | 151 initial_pos, user_gesture); |
| 152 } |
151 } | 153 } |
152 | 154 |
153 void PanelHost::RenderViewCreated(content::RenderViewHost* render_view_host) { | 155 void PanelHost::RenderViewCreated(content::RenderViewHost* render_view_host) { |
154 } | 156 } |
155 | 157 |
156 void PanelHost::RenderViewReady() { | 158 void PanelHost::RenderViewReady() { |
157 } | 159 } |
158 | 160 |
159 void PanelHost::RenderViewGone(base::TerminationStatus status) { | 161 void PanelHost::RenderViewGone(base::TerminationStatus status) { |
160 CloseContents(web_contents_.get()); | 162 CloseContents(web_contents_.get()); |
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
444 } | 446 } |
445 | 447 |
446 void PanelViewAura::FlashFrame(bool flash) { | 448 void PanelViewAura::FlashFrame(bool flash) { |
447 // TODO(stevenjb): Implement | 449 // TODO(stevenjb): Implement |
448 NOTIMPLEMENTED(); | 450 NOTIMPLEMENTED(); |
449 } | 451 } |
450 | 452 |
451 bool PanelViewAura::IsAlwaysOnTop() const { | 453 bool PanelViewAura::IsAlwaysOnTop() const { |
452 return true; | 454 return true; |
453 } | 455 } |
OLD | NEW |