Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(710)

Side by Side Diff: content/shell/browser/shell_views.cc

Issue 138363004: Views Textfield fixes and cleanup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync and rebase. Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "content/public/browser/web_contents.h" 9 #include "content/public/browser/web_contents.h"
10 #include "content/public/browser/web_contents_view.h" 10 #include "content/public/browser/web_contents_view.h"
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 stop_button_->SetStyle(views::Button::STYLE_BUTTON); 177 stop_button_->SetStyle(views::Button::STYLE_BUTTON);
178 gfx::Size stop_button_size = stop_button_->GetPreferredSize(); 178 gfx::Size stop_button_size = stop_button_->GetPreferredSize();
179 toolbar_column_set->AddColumn(views::GridLayout::CENTER, 179 toolbar_column_set->AddColumn(views::GridLayout::CENTER,
180 views::GridLayout::CENTER, 0, 180 views::GridLayout::CENTER, 0,
181 views::GridLayout::FIXED, 181 views::GridLayout::FIXED,
182 stop_button_size.width(), 182 stop_button_size.width(),
183 stop_button_size.width() / 2); 183 stop_button_size.width() / 2);
184 toolbar_column_set->AddPaddingColumn(0, 2); 184 toolbar_column_set->AddPaddingColumn(0, 2);
185 // URL entry 185 // URL entry
186 url_entry_ = new views::Textfield(); 186 url_entry_ = new views::Textfield();
187 url_entry_->SetController(this); 187 url_entry_->set_controller(this);
188 toolbar_column_set->AddColumn(views::GridLayout::FILL, 188 toolbar_column_set->AddColumn(views::GridLayout::FILL,
189 views::GridLayout::FILL, 1, 189 views::GridLayout::FILL, 1,
190 views::GridLayout::USE_PREF, 0, 0); 190 views::GridLayout::USE_PREF, 0, 0);
191 191
192 // Fill up the first row 192 // Fill up the first row
193 toolbar_layout->StartRow(0, 0); 193 toolbar_layout->StartRow(0, 0);
194 toolbar_layout->AddView(back_button_); 194 toolbar_layout->AddView(back_button_);
195 toolbar_layout->AddView(forward_button_); 195 toolbar_layout->AddView(forward_button_);
196 toolbar_layout->AddView(refresh_button_); 196 toolbar_layout->AddView(refresh_button_);
197 toolbar_layout->AddView(stop_button_); 197 toolbar_layout->AddView(stop_button_);
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 } 385 }
386 386
387 void Shell::PlatformSetTitle(const base::string16& title) { 387 void Shell::PlatformSetTitle(const base::string16& title) {
388 ShellWindowDelegateView* delegate_view = 388 ShellWindowDelegateView* delegate_view =
389 static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate()); 389 static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate());
390 delegate_view->SetWindowTitle(title); 390 delegate_view->SetWindowTitle(title);
391 window_widget_->UpdateWindowTitle(); 391 window_widget_->UpdateWindowTitle();
392 } 392 }
393 393
394 } // namespace content 394 } // namespace content
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/profile_chooser_view.cc ('k') | ui/app_list/views/folder_header_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698