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

Unified Diff: ash/shell/window_type_launcher.cc

Issue 608283003: Remove retail mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: ash/shell/window_type_launcher.cc
diff --git a/ash/shell/window_type_launcher.cc b/ash/shell/window_type_launcher.cc
index cbd2db34e326d5697bb3612fedf142f0acfd3565..a27c7b6a5ae6970eacf2a1b5702decc84b5601d3 100644
--- a/ash/shell/window_type_launcher.cc
+++ b/ash/shell/window_type_launcher.cc
@@ -5,7 +5,6 @@
#include "ash/shell/window_type_launcher.h"
#include "ash/root_window_controller.h"
-#include "ash/screensaver/screensaver_view.h"
#include "ash/session/session_state_delegate.h"
#include "ash/shelf/shelf_widget.h"
#include "ash/shell.h"
@@ -225,8 +224,6 @@ WindowTypeLauncher::WindowTypeLauncher()
this, base::ASCIIToUTF16("Open Views Examples Window"))),
show_hide_window_button_(new views::LabelButton(
this, base::ASCIIToUTF16("Show/Hide a Window"))),
- show_screensaver_(new views::LabelButton(
- this, base::ASCIIToUTF16("Show the Screensaver [for 5 seconds]"))),
show_web_notification_(new views::LabelButton(
this, base::ASCIIToUTF16("Show a web/app notification"))) {
create_button_->SetStyle(views::Button::STYLE_BUTTON);
@@ -241,7 +238,6 @@ WindowTypeLauncher::WindowTypeLauncher()
transient_button_->SetStyle(views::Button::STYLE_BUTTON);
examples_button_->SetStyle(views::Button::STYLE_BUTTON);
show_hide_window_button_->SetStyle(views::Button::STYLE_BUTTON);
- show_screensaver_->SetStyle(views::Button::STYLE_BUTTON);
show_web_notification_->SetStyle(views::Button::STYLE_BUTTON);
views::GridLayout* layout = new views::GridLayout(this);
@@ -266,7 +262,6 @@ WindowTypeLauncher::WindowTypeLauncher()
AddViewToLayout(layout, transient_button_);
AddViewToLayout(layout, examples_button_);
AddViewToLayout(layout, show_hide_window_button_);
- AddViewToLayout(layout, show_screensaver_);
AddViewToLayout(layout, show_web_notification_);
set_context_menu_controller(this);
}
@@ -333,13 +328,6 @@ void WindowTypeLauncher::ButtonPressed(views::Button* sender,
NonModalTransient::OpenNonModalTransient(GetWidget()->GetNativeView());
} else if (sender == show_hide_window_button_) {
NonModalTransient::ToggleNonModalTransient(GetWidget()->GetNativeView());
- } else if (sender == show_screensaver_) {
- ash::ShowScreensaver(GURL("http://www.google.com"));
- content::BrowserThread::PostDelayedTask(content::BrowserThread::UI,
- FROM_HERE,
- base::Bind(&ash::CloseScreensaver),
- base::TimeDelta::FromSeconds(5));
-
} else if (sender == show_web_notification_) {
scoped_ptr<message_center::Notification> notification;
notification.reset(new message_center::Notification(

Powered by Google App Engine
This is Rietveld 408576698