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/auto_reset.h" | 7 #include "base/auto_reset.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 Shell* shell = CreateShell(web_contents); | 119 Shell* shell = CreateShell(web_contents); |
120 if (!url.is_empty()) | 120 if (!url.is_empty()) |
121 shell->LoadURL(url); | 121 shell->LoadURL(url); |
122 return shell; | 122 return shell; |
123 } | 123 } |
124 | 124 |
125 void Shell::LoadURL(const GURL& url) { | 125 void Shell::LoadURL(const GURL& url) { |
126 web_contents_->GetController().LoadURL( | 126 web_contents_->GetController().LoadURL( |
127 url, | 127 url, |
128 Referrer(), | 128 Referrer(), |
129 PAGE_TRANSITION_TYPED, | 129 static_cast<PageTransition>( |
| 130 PAGE_TRANSITION_TYPED | PAGE_TRANSITION_FROM_ADDRESS_BAR), |
130 std::string()); | 131 std::string()); |
131 web_contents_->Focus(); | 132 web_contents_->Focus(); |
132 } | 133 } |
133 | 134 |
134 void Shell::GoBackOrForward(int offset) { | 135 void Shell::GoBackOrForward(int offset) { |
135 web_contents_->GetController().GoToOffset(offset); | 136 web_contents_->GetController().GoToOffset(offset); |
136 web_contents_->Focus(); | 137 web_contents_->Focus(); |
137 } | 138 } |
138 | 139 |
139 void Shell::Reload() { | 140 void Shell::Reload() { |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
232 Details<std::pair<NavigationEntry*, bool> >(details).ptr(); | 233 Details<std::pair<NavigationEntry*, bool> >(details).ptr(); |
233 | 234 |
234 if (title->first) { | 235 if (title->first) { |
235 string16 text = title->first->GetTitle(); | 236 string16 text = title->first->GetTitle(); |
236 PlatformSetTitle(text); | 237 PlatformSetTitle(text); |
237 } | 238 } |
238 } | 239 } |
239 } | 240 } |
240 | 241 |
241 } // namespace content | 242 } // namespace content |
OLD | NEW |