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

Side by Side Diff: chrome/browser/ui/views/window.cc

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/views/window.h ('k') | chrome/browser/ui/views/wrench_menu.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) 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/ui/views/window.h" 5 #include "chrome/browser/ui/views/window.h"
6 6
7 #include "gfx/rect.h" 7 #include "ui/gfx/rect.h"
8 #include "views/window/window.h" 8 #include "views/window/window.h"
9 9
10 #if defined(OS_CHROMEOS) 10 #if defined(OS_CHROMEOS)
11 #include "chrome/browser/chromeos/frame/bubble_window.h" 11 #include "chrome/browser/chromeos/frame/bubble_window.h"
12 #endif // defined(OS_CHROMEOS) 12 #endif // defined(OS_CHROMEOS)
13 13
14 namespace browser { 14 namespace browser {
15 15
16 views::Window* CreateViewsWindow(gfx::NativeWindow parent, 16 views::Window* CreateViewsWindow(gfx::NativeWindow parent,
17 const gfx::Rect& bounds, 17 const gfx::Rect& bounds,
18 views::WindowDelegate* delegate) { 18 views::WindowDelegate* delegate) {
19 #if defined(OS_CHROMEOS) 19 #if defined(OS_CHROMEOS)
20 return chromeos::BubbleWindow::Create(parent, 20 return chromeos::BubbleWindow::Create(parent,
21 gfx::Rect(), 21 gfx::Rect(),
22 chromeos::BubbleWindow::STYLE_GENERIC, 22 chromeos::BubbleWindow::STYLE_GENERIC,
23 delegate); 23 delegate);
24 #else 24 #else
25 return views::Window::CreateChromeWindow(parent, gfx::Rect(), delegate); 25 return views::Window::CreateChromeWindow(parent, gfx::Rect(), delegate);
26 #endif 26 #endif
27 } 27 }
28 28
29 } // namespace browser 29 } // namespace browser
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/window.h ('k') | chrome/browser/ui/views/wrench_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698