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

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: Fix windows 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 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 // Setup layout rows. 221 // Setup layout rows.
222 layout->StartRow(0, 0); 222 layout->StartRow(0, 0);
223 layout->AddView(toolbar_row); 223 layout->AddView(toolbar_row);
224 224
225 layout->AddPaddingRow(0, kInnerMargin); 225 layout->AddPaddingRow(0, kInnerMargin);
226 226
227 layout->StartRow(1, 1); 227 layout->StartRow(1, 1);
228 layout->AddView(web_view_container_.release()); 228 layout->AddView(web_view_container_.release());
229 layout->AddPaddingRow(0, kInnerMargin); 229 layout->AddPaddingRow(0, kInnerMargin);
230 230
231 location_bar_->Init(); 231 location_bar_->Init(NULL);
232 UpdateReload(web_view_->web_contents()->IsLoading(), true); 232 UpdateReload(web_view_->web_contents()->IsLoading(), true);
233 233
234 Layout(); 234 Layout();
235 } 235 }
236 236
237 views::View* SimpleWebViewDialog::GetContentsView() { 237 views::View* SimpleWebViewDialog::GetContentsView() {
238 return this; 238 return this;
239 } 239 }
240 240
241 views::View* SimpleWebViewDialog::GetInitiallyFocusedView() { 241 views::View* SimpleWebViewDialog::GetInitiallyFocusedView() {
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 398
399 void SimpleWebViewDialog::UpdateReload(bool is_loading, bool force) { 399 void SimpleWebViewDialog::UpdateReload(bool is_loading, bool force) {
400 if (reload_) { 400 if (reload_) {
401 reload_->ChangeMode( 401 reload_->ChangeMode(
402 is_loading ? ReloadButton::MODE_STOP : ReloadButton::MODE_RELOAD, 402 is_loading ? ReloadButton::MODE_STOP : ReloadButton::MODE_RELOAD,
403 force); 403 force);
404 } 404 }
405 } 405 }
406 406
407 } // namespace chromeos 407 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/browser_view.h » ('j') | chrome/browser/ui/views/frame/contents_container.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698