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 "content/shell/shell.h" | 5 #include "content/shell/shell.h" |
6 | 6 |
7 #include "base/message_loop.h" | 7 #include "base/message_loop.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
10 #include "content/browser/tab_contents/navigation_controller_impl.h" | 10 #include "content/browser/tab_contents/navigation_controller_impl.h" |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
48 tab_contents->SetDelegate(shell); | 48 tab_contents->SetDelegate(shell); |
49 | 49 |
50 shell->PlatformSetContents(); | 50 shell->PlatformSetContents(); |
51 | 51 |
52 shell->PlatformResizeSubViews(); | 52 shell->PlatformResizeSubViews(); |
53 return shell; | 53 return shell; |
54 } | 54 } |
55 | 55 |
56 Shell* Shell::CreateNewWindow(content::BrowserContext* browser_context, | 56 Shell* Shell::CreateNewWindow(content::BrowserContext* browser_context, |
57 const GURL& url, | 57 const GURL& url, |
58 SiteInstance* site_instance, | 58 content::SiteInstance* site_instance, |
jam
2012/01/24 03:29:33
ditto
ananta
2012/01/24 23:46:26
Done.
| |
59 int routing_id, | 59 int routing_id, |
60 TabContents* base_tab_contents) { | 60 TabContents* base_tab_contents) { |
61 TabContents* tab_contents = new TabContents( | 61 TabContents* tab_contents = new TabContents( |
62 browser_context, | 62 browser_context, |
63 site_instance, | 63 site_instance, |
64 routing_id, | 64 routing_id, |
65 base_tab_contents, | 65 base_tab_contents, |
66 NULL); | 66 NULL); |
67 Shell* shell = CreateShell(tab_contents); | 67 Shell* shell = CreateShell(tab_contents); |
68 if (!url.is_empty()) | 68 if (!url.is_empty()) |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
124 void Shell::DidNavigateMainFramePostCommit(WebContents* tab) { | 124 void Shell::DidNavigateMainFramePostCommit(WebContents* tab) { |
125 PlatformSetAddressBarURL(tab->GetURL()); | 125 PlatformSetAddressBarURL(tab->GetURL()); |
126 } | 126 } |
127 | 127 |
128 void Shell::UpdatePreferredSize(WebContents* source, | 128 void Shell::UpdatePreferredSize(WebContents* source, |
129 const gfx::Size& pref_size) { | 129 const gfx::Size& pref_size) { |
130 PlatformSizeTo(pref_size.width(), pref_size.height()); | 130 PlatformSizeTo(pref_size.width(), pref_size.height()); |
131 } | 131 } |
132 | 132 |
133 } // namespace content | 133 } // namespace content |
OLD | NEW |