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

Side by Side Diff: ui/views/widget/native_widget_win.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/native_widget_win.h ('k') | ui/views/widget/tooltip_manager_aura.h » ('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/native_widget_win.h" 5 #include "ui/views/widget/native_widget_win.h"
6 6
7 #include <dwmapi.h> 7 #include <dwmapi.h>
8 #include <shellapi.h> 8 #include <shellapi.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 message_handler_->CenterWindow(size_in_pixels); 225 message_handler_->CenterWindow(size_in_pixels);
226 } 226 }
227 227
228 void NativeWidgetWin::GetWindowPlacement( 228 void NativeWidgetWin::GetWindowPlacement(
229 gfx::Rect* bounds, 229 gfx::Rect* bounds,
230 ui::WindowShowState* show_state) const { 230 ui::WindowShowState* show_state) const {
231 message_handler_->GetWindowPlacement(bounds, show_state); 231 message_handler_->GetWindowPlacement(bounds, show_state);
232 *bounds = gfx::win::ScreenToDIPRect(*bounds); 232 *bounds = gfx::win::ScreenToDIPRect(*bounds);
233 } 233 }
234 234
235 bool NativeWidgetWin::SetWindowTitle(const string16& title) { 235 bool NativeWidgetWin::SetWindowTitle(const base::string16& title) {
236 return message_handler_->SetTitle(title); 236 return message_handler_->SetTitle(title);
237 } 237 }
238 238
239 void NativeWidgetWin::SetWindowIcons(const gfx::ImageSkia& window_icon, 239 void NativeWidgetWin::SetWindowIcons(const gfx::ImageSkia& window_icon,
240 const gfx::ImageSkia& app_icon) { 240 const gfx::ImageSkia& app_icon) {
241 message_handler_->SetWindowIcons(window_icon, app_icon); 241 message_handler_->SetWindowIcons(window_icon, app_icon);
242 } 242 }
243 243
244 void NativeWidgetWin::InitModalType(ui::ModalType modal_type) { 244 void NativeWidgetWin::InitModalType(ui::ModalType modal_type) {
245 message_handler_->InitModalType(modal_type); 245 message_handler_->InitModalType(modal_type);
(...skipping 809 matching lines...) Expand 10 before | Expand all | Expand 10 after
1055 // static 1055 // static
1056 bool NativeWidgetPrivate::IsTouchDown() { 1056 bool NativeWidgetPrivate::IsTouchDown() {
1057 // This currently isn't necessary because we're not generating touch events on 1057 // This currently isn't necessary because we're not generating touch events on
1058 // windows. When we do, this will need to be updated. 1058 // windows. When we do, this will need to be updated.
1059 return false; 1059 return false;
1060 } 1060 }
1061 1061
1062 } // namespace internal 1062 } // namespace internal
1063 1063
1064 } // namespace views 1064 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/widget/native_widget_win.h ('k') | ui/views/widget/tooltip_manager_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698