| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/browser/shell.h" | 5 #include "content/shell/browser/shell.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 gfx::Size stop_button_size = stop_button_->GetPreferredSize(); | 167 gfx::Size stop_button_size = stop_button_->GetPreferredSize(); |
| 168 toolbar_column_set->AddColumn(views::GridLayout::CENTER, | 168 toolbar_column_set->AddColumn(views::GridLayout::CENTER, |
| 169 views::GridLayout::CENTER, 0, | 169 views::GridLayout::CENTER, 0, |
| 170 views::GridLayout::FIXED, | 170 views::GridLayout::FIXED, |
| 171 stop_button_size.width(), | 171 stop_button_size.width(), |
| 172 stop_button_size.width() / 2); | 172 stop_button_size.width() / 2); |
| 173 toolbar_column_set->AddPaddingColumn(0, 2); | 173 toolbar_column_set->AddPaddingColumn(0, 2); |
| 174 // URL entry | 174 // URL entry |
| 175 url_entry_ = new views::Textfield(); | 175 url_entry_ = new views::Textfield(); |
| 176 url_entry_->set_controller(this); | 176 url_entry_->set_controller(this); |
| 177 url_entry_->SetTextInputType(ui::TextInputType::TEXT_INPUT_TYPE_URL); |
| 177 toolbar_column_set->AddColumn(views::GridLayout::FILL, | 178 toolbar_column_set->AddColumn(views::GridLayout::FILL, |
| 178 views::GridLayout::FILL, 1, | 179 views::GridLayout::FILL, 1, |
| 179 views::GridLayout::USE_PREF, 0, 0); | 180 views::GridLayout::USE_PREF, 0, 0); |
| 180 toolbar_column_set->AddPaddingColumn(0, 2); | 181 toolbar_column_set->AddPaddingColumn(0, 2); |
| 181 | 182 |
| 182 // Fill up the first row | 183 // Fill up the first row |
| 183 toolbar_layout->StartRow(0, 0); | 184 toolbar_layout->StartRow(0, 0); |
| 184 toolbar_layout->AddView(back_button_); | 185 toolbar_layout->AddView(back_button_); |
| 185 toolbar_layout->AddView(forward_button_); | 186 toolbar_layout->AddView(forward_button_); |
| 186 toolbar_layout->AddView(refresh_button_); | 187 toolbar_layout->AddView(refresh_button_); |
| (...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 458 void Shell::PlatformSetTitle(const base::string16& title) { | 459 void Shell::PlatformSetTitle(const base::string16& title) { |
| 459 if (headless_) | 460 if (headless_) |
| 460 return; | 461 return; |
| 461 ShellWindowDelegateView* delegate_view = | 462 ShellWindowDelegateView* delegate_view = |
| 462 static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate()); | 463 static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate()); |
| 463 delegate_view->SetWindowTitle(title); | 464 delegate_view->SetWindowTitle(title); |
| 464 window_widget_->UpdateWindowTitle(); | 465 window_widget_->UpdateWindowTitle(); |
| 465 } | 466 } |
| 466 | 467 |
| 467 } // namespace content | 468 } // namespace content |
| OLD | NEW |