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

Unified Diff: chrome/browser/chromeos/enrollment_dialog_view.cc

Issue 10389197: browser: Remove views includes from enrollment_dialog_view.cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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
« no previous file with comments | « chrome/browser/DEPS ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/enrollment_dialog_view.cc
diff --git a/chrome/browser/chromeos/enrollment_dialog_view.cc b/chrome/browser/chromeos/enrollment_dialog_view.cc
index c2b85cf6fafc49d318ae40984f96b302d819a94e..d2e9288818139dbbc05017491f12c4b0c776a476 100644
--- a/chrome/browser/chromeos/enrollment_dialog_view.cc
+++ b/chrome/browser/chromeos/enrollment_dialog_view.cc
@@ -9,29 +9,17 @@
#include "chrome/browser/chromeos/cros/network_library.h"
#include "chrome/browser/extensions/extension_host.h"
#include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/themes/theme_service.h"
#include "chrome/browser/ui/browser_finder.h"
-#include "chrome/browser/ui/views/extensions/extension_dialog.h"
-#include "chrome/browser/ui/views/extensions/extension_dialog_observer.h"
#include "chrome/common/url_constants.h"
#include "content/public/common/page_transition_types.h"
#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
-#include "ui/views/border.h"
#include "ui/views/controls/label.h"
-#include "ui/views/controls/webview/webview.h"
#include "ui/views/layout/grid_layout.h"
#include "ui/views/layout/layout_constants.h"
#include "ui/views/widget/widget.h"
-using views::Border;
-using views::ColumnSet;
-using views::GridLayout;
-using views::Label;
-using views::LayoutManager;
-using views::View;
-
namespace chromeos {
namespace {
@@ -158,16 +146,16 @@ views::View* EnrollmentDialogView::GetContentsView() {
void EnrollmentDialogView::InitDialog() {
added_cert_ = false;
// Create the views and layout manager and set them up.
- Label* label = new Label(
+ views::Label* label = new views::Label(
l10n_util::GetStringFUTF16(IDS_NETWORK_ENROLLMENT_HANDLER_INSTRUCTIONS,
UTF8ToUTF16(network_name_)));
- label->SetFont(
- ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont));
- label->SetHorizontalAlignment(Label::ALIGN_LEFT);
+ label->SetFont(ui::ResourceBundle::GetSharedInstance().GetFont(
+ ui::ResourceBundle::BaseFont));
+ label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
label->SetMultiLine(true);
label->SetAllowCharacterBreak(true);
- GridLayout* grid_layout = GridLayout::CreatePanel(this);
+ views::GridLayout* grid_layout = views::GridLayout::CreatePanel(this);
SetLayoutManager(grid_layout);
views::ColumnSet* columns = grid_layout->AddColumnSet(0);
« no previous file with comments | « chrome/browser/DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698