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

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

Issue 8547015: Revert 110949 - views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/message_bubble.h" 5 #include "chrome/browser/chromeos/login/message_bubble.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "chrome/browser/chromeos/login/helper.h" 11 #include "chrome/browser/chromeos/login/helper.h"
12 #include "grit/generated_resources.h" 12 #include "grit/generated_resources.h"
13 #include "grit/theme_resources_standard.h" 13 #include "grit/theme_resources_standard.h"
14 #include "ui/base/resource/resource_bundle.h" 14 #include "ui/base/resource/resource_bundle.h"
15 #include "ui/views/layout/grid_layout.h" 15 #include "ui/views/layout/grid_layout.h"
16 #include "ui/views/widget/widget.h"
17 #include "views/controls/button/image_button.h" 16 #include "views/controls/button/image_button.h"
18 #include "views/controls/image_view.h" 17 #include "views/controls/image_view.h"
19 #include "views/controls/label.h" 18 #include "views/controls/label.h"
20 #include "views/controls/link.h" 19 #include "views/controls/link.h"
20 #include "views/widget/widget.h"
21 21
22 namespace chromeos { 22 namespace chromeos {
23 23
24 static const int kBorderSize = 4; 24 static const int kBorderSize = 4;
25 static const int kMaxLabelWidth = 250; 25 static const int kMaxLabelWidth = 250;
26 26
27 MessageBubble::MessageBubble(views::Widget::InitParams::Type type, 27 MessageBubble::MessageBubble(views::Widget::InitParams::Type type,
28 views::Widget* parent, 28 views::Widget* parent,
29 SkBitmap* image, 29 SkBitmap* image,
30 const std::wstring& text, 30 const std::wstring& text,
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 #if !defined(TOUCH_UI) && defined(TOOLKIT_USES_GTK) 201 #if !defined(TOUCH_UI) && defined(TOOLKIT_USES_GTK)
202 gboolean MessageBubble::OnButtonPress(GtkWidget* widget, 202 gboolean MessageBubble::OnButtonPress(GtkWidget* widget,
203 GdkEventButton* event) { 203 GdkEventButton* event) {
204 NativeWidgetGtk::OnButtonPress(widget, event); 204 NativeWidgetGtk::OnButtonPress(widget, event);
205 // Never propagate event to parent. 205 // Never propagate event to parent.
206 return true; 206 return true;
207 } 207 }
208 #endif 208 #endif
209 209
210 } // namespace chromeos 210 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/message_bubble.h ('k') | chrome/browser/chromeos/login/password_changed_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698