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

Side by Side Diff: ui/views/widget/widget_delegate.cc

Issue 117983002: Prefix string16 with base:: in ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 7 years 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
« no previous file with comments | « ui/views/widget/widget_delegate.h ('k') | ui/views/widget/widget_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "ui/views/widget/widget_delegate.h" 5 #include "ui/views/widget/widget_delegate.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "ui/gfx/image/image_skia.h" 8 #include "ui/gfx/image/image_skia.h"
9 #include "ui/views/bubble/bubble_delegate.h" 9 #include "ui/views/bubble/bubble_delegate.h"
10 #include "ui/views/view.h" 10 #include "ui/views/view.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 } 54 }
55 55
56 ui::ModalType WidgetDelegate::GetModalType() const { 56 ui::ModalType WidgetDelegate::GetModalType() const {
57 return ui::MODAL_TYPE_NONE; 57 return ui::MODAL_TYPE_NONE;
58 } 58 }
59 59
60 ui::AccessibilityTypes::Role WidgetDelegate::GetAccessibleWindowRole() const { 60 ui::AccessibilityTypes::Role WidgetDelegate::GetAccessibleWindowRole() const {
61 return ui::AccessibilityTypes::ROLE_WINDOW; 61 return ui::AccessibilityTypes::ROLE_WINDOW;
62 } 62 }
63 63
64 string16 WidgetDelegate::GetAccessibleWindowTitle() const { 64 base::string16 WidgetDelegate::GetAccessibleWindowTitle() const {
65 return GetWindowTitle(); 65 return GetWindowTitle();
66 } 66 }
67 67
68 string16 WidgetDelegate::GetWindowTitle() const { 68 base::string16 WidgetDelegate::GetWindowTitle() const {
69 return string16(); 69 return base::string16();
70 } 70 }
71 71
72 bool WidgetDelegate::ShouldShowWindowTitle() const { 72 bool WidgetDelegate::ShouldShowWindowTitle() const {
73 return true; 73 return true;
74 } 74 }
75 75
76 bool WidgetDelegate::ShouldShowCloseButton() const { 76 bool WidgetDelegate::ShouldShowCloseButton() const {
77 return true; 77 return true;
78 } 78 }
79 79
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 190
191 Widget* WidgetDelegateView::GetWidget() { 191 Widget* WidgetDelegateView::GetWidget() {
192 return View::GetWidget(); 192 return View::GetWidget();
193 } 193 }
194 194
195 const Widget* WidgetDelegateView::GetWidget() const { 195 const Widget* WidgetDelegateView::GetWidget() const {
196 return View::GetWidget(); 196 return View::GetWidget();
197 } 197 }
198 198
199 } // namespace views 199 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/widget/widget_delegate.h ('k') | ui/views/widget/widget_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698