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

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

Issue 731423002: Remove OriginChip code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix gyp file and bad merge Created 5 years, 10 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/ui/simple_web_view_dialog.h" 5 #include "chrome/browser/chromeos/login/ui/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/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 // Notreached because SimpleWebViewDialog uses a popup-mode LocationBarView, 315 // Notreached because SimpleWebViewDialog uses a popup-mode LocationBarView,
316 // and it doesn't create PageActionImageViews. 316 // and it doesn't create PageActionImageViews.
317 NOTREACHED(); 317 NOTREACHED();
318 return NULL; 318 return NULL;
319 } 319 }
320 320
321 content::WebContents* SimpleWebViewDialog::GetActiveWebContents() const { 321 content::WebContents* SimpleWebViewDialog::GetActiveWebContents() const {
322 return web_view_->web_contents(); 322 return web_view_->web_contents();
323 } 323 }
324 324
325 bool SimpleWebViewDialog::InTabbedBrowser() const {
326 return false;
327 }
328
329 void SimpleWebViewDialog::ExecuteCommandWithDisposition( 325 void SimpleWebViewDialog::ExecuteCommandWithDisposition(
330 int id, 326 int id,
331 WindowOpenDisposition) { 327 WindowOpenDisposition) {
332 WebContents* web_contents = web_view_->web_contents(); 328 WebContents* web_contents = web_view_->web_contents();
333 switch (id) { 329 switch (id) {
334 case IDC_BACK: 330 case IDC_BACK:
335 if (web_contents->GetController().CanGoBack()) { 331 if (web_contents->GetController().CanGoBack()) {
336 location_bar_->Revert(); 332 location_bar_->Revert();
337 web_contents->GetController().GoBack(); 333 web_contents->GetController().GoBack();
338 } 334 }
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 387
392 void SimpleWebViewDialog::UpdateReload(bool is_loading, bool force) { 388 void SimpleWebViewDialog::UpdateReload(bool is_loading, bool force) {
393 if (reload_) { 389 if (reload_) {
394 reload_->ChangeMode( 390 reload_->ChangeMode(
395 is_loading ? ReloadButton::MODE_STOP : ReloadButton::MODE_RELOAD, 391 is_loading ? ReloadButton::MODE_STOP : ReloadButton::MODE_RELOAD,
396 force); 392 force);
397 } 393 }
398 } 394 }
399 395
400 } // namespace chromeos 396 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/ui/simple_web_view_dialog.h ('k') | chrome/browser/search/search.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698