Chromium Code Reviews| 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" |
| 11 #include "content/browser/tab_contents/tab_contents.h" | 11 #include "content/browser/tab_contents/tab_contents.h" |
| 12 #include "ui/gfx/size.h" | 12 #include "ui/gfx/size.h" |
| 13 | 13 |
| 14 using content::SiteInstance; | |
|
jam
2012/01/25 02:02:17
nit: not needed since this file is in the content
ananta
2012/01/25 02:16:29
Done.
| |
| 15 | |
| 14 // Content area size for newly created windows. | 16 // Content area size for newly created windows. |
| 15 static const int kTestWindowWidth = 800; | 17 static const int kTestWindowWidth = 800; |
| 16 static const int kTestWindowHeight = 600; | 18 static const int kTestWindowHeight = 600; |
| 17 | 19 |
| 18 namespace content { | 20 namespace content { |
| 19 | 21 |
| 20 std::vector<Shell*> Shell::windows_; | 22 std::vector<Shell*> Shell::windows_; |
| 21 | 23 |
| 22 Shell::Shell() | 24 Shell::Shell() |
| 23 : window_(NULL), | 25 : window_(NULL), |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 124 void Shell::DidNavigateMainFramePostCommit(WebContents* tab) { | 126 void Shell::DidNavigateMainFramePostCommit(WebContents* tab) { |
| 125 PlatformSetAddressBarURL(tab->GetURL()); | 127 PlatformSetAddressBarURL(tab->GetURL()); |
| 126 } | 128 } |
| 127 | 129 |
| 128 void Shell::UpdatePreferredSize(WebContents* source, | 130 void Shell::UpdatePreferredSize(WebContents* source, |
| 129 const gfx::Size& pref_size) { | 131 const gfx::Size& pref_size) { |
| 130 PlatformSizeTo(pref_size.width(), pref_size.height()); | 132 PlatformSizeTo(pref_size.width(), pref_size.height()); |
| 131 } | 133 } |
| 132 | 134 |
| 133 } // namespace content | 135 } // namespace content |
| OLD | NEW |