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

Side by Side Diff: chrome/browser/chromeos/login/simple_web_view_dialog.cc

Issue 10580039: Adds ability to render omnibox as a view above the page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanup Created 8 years, 6 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 (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 "chrome/browser/chromeos/login/simple_web_view_dialog.h" 5 #include "chrome/browser/chromeos/login/simple_web_view_dialog.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_window_ids.h" 8 #include "ash/shell_window_ids.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 // Setup layout rows. 220 // Setup layout rows.
221 layout->StartRow(0, 0); 221 layout->StartRow(0, 0);
222 layout->AddView(toolbar_row); 222 layout->AddView(toolbar_row);
223 223
224 layout->AddPaddingRow(0, kInnerMargin); 224 layout->AddPaddingRow(0, kInnerMargin);
225 225
226 layout->StartRow(1, 1); 226 layout->StartRow(1, 1);
227 layout->AddView(web_view_container_.release()); 227 layout->AddView(web_view_container_.release());
228 layout->AddPaddingRow(0, kInnerMargin); 228 layout->AddPaddingRow(0, kInnerMargin);
229 229
230 location_bar_->Init(); 230 location_bar_->Init(NULL);
231 UpdateReload(web_view_->web_contents()->IsLoading(), true); 231 UpdateReload(web_view_->web_contents()->IsLoading(), true);
232 232
233 Layout(); 233 Layout();
234 } 234 }
235 235
236 views::View* SimpleWebViewDialog::GetContentsView() { 236 views::View* SimpleWebViewDialog::GetContentsView() {
237 return this; 237 return this;
238 } 238 }
239 239
240 views::View* SimpleWebViewDialog::GetInitiallyFocusedView() { 240 views::View* SimpleWebViewDialog::GetInitiallyFocusedView() {
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 397
398 void SimpleWebViewDialog::UpdateReload(bool is_loading, bool force) { 398 void SimpleWebViewDialog::UpdateReload(bool is_loading, bool force) {
399 if (reload_) { 399 if (reload_) {
400 reload_->ChangeMode( 400 reload_->ChangeMode(
401 is_loading ? ReloadButton::MODE_STOP : ReloadButton::MODE_RELOAD, 401 is_loading ? ReloadButton::MODE_STOP : ReloadButton::MODE_RELOAD,
402 force); 402 force);
403 } 403 }
404 } 404 }
405 405
406 } // namespace chromeos 406 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698