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/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
8 #include "ui/aura/desktop/desktop_screen.h" | 8 #include "ui/aura/desktop/desktop_screen.h" |
9 #include "ui/aura/desktop/desktop_stacking_client.h" | 9 #include "ui/aura/desktop/desktop_stacking_client.h" |
10 #include "ui/aura/display_manager.h" | 10 #include "ui/aura/display_manager.h" |
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
259 url = GURL(std::string("http://") + std::string(text)); | 259 url = GURL(std::string("http://") + std::string(text)); |
260 url_entry_->SetText(ASCIIToUTF16(url.spec())); | 260 url_entry_->SetText(ASCIIToUTF16(url.spec())); |
261 } | 261 } |
262 shell_->LoadURL(url); | 262 shell_->LoadURL(url); |
263 return true; | 263 return true; |
264 } | 264 } |
265 return false; | 265 return false; |
266 } | 266 } |
267 | 267 |
268 // Overriden from ButtonListener | 268 // Overriden from ButtonListener |
269 virtual void ButtonPressed(Button* sender, | 269 virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE { |
270 const Event& event) OVERRIDE { | |
271 if (sender == back_button_) | 270 if (sender == back_button_) |
272 shell_->GoBackOrForward(-1); | 271 shell_->GoBackOrForward(-1); |
273 else if (sender == forward_button_) | 272 else if (sender == forward_button_) |
274 shell_->GoBackOrForward(1); | 273 shell_->GoBackOrForward(1); |
275 else if (sender == refresh_button_) | 274 else if (sender == refresh_button_) |
276 shell_->Reload(); | 275 shell_->Reload(); |
277 else if (sender == stop_button_) | 276 else if (sender == stop_button_) |
278 shell_->Stop(); | 277 shell_->Stop(); |
279 } | 278 } |
280 | 279 |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
405 } | 404 } |
406 | 405 |
407 void Shell::PlatformSetTitle(const string16& title) { | 406 void Shell::PlatformSetTitle(const string16& title) { |
408 ShellWindowDelegateView* delegate_view = | 407 ShellWindowDelegateView* delegate_view = |
409 static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate()); | 408 static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate()); |
410 delegate_view->SetWindowTitle(title); | 409 delegate_view->SetWindowTitle(title); |
411 window_widget_->UpdateWindowTitle(); | 410 window_widget_->UpdateWindowTitle(); |
412 } | 411 } |
413 | 412 |
414 } // namespace content | 413 } // namespace content |
OLD | NEW |