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

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

Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 6 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
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 "chrome/browser/ui/views/constrained_window_views.h" 5 #include "chrome/browser/ui/views/constrained_window_views.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "chrome/app/chrome_command_ids.h" 11 #include "chrome/app/chrome_command_ids.h"
12 #include "chrome/browser/platform_util.h" 12 #include "chrome/browser/platform_util.h"
13 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/themes/theme_properties.h" 14 #include "chrome/browser/themes/theme_properties.h"
15 #include "chrome/browser/ui/toolbar/toolbar_model.h" 15 #include "chrome/browser/ui/toolbar/toolbar_model.h"
16 #include "chrome/browser/ui/views/frame/browser_view.h" 16 #include "chrome/browser/ui/views/frame/browser_view.h"
17 #include "chrome/browser/ui/views/theme_image_mapper.h" 17 #include "chrome/browser/ui/views/theme_image_mapper.h"
18 #include "chrome/common/chrome_constants.h" 18 #include "chrome/common/chrome_constants.h"
19 #include "components/web_modal/web_contents_modal_dialog_host.h" 19 #include "components/web_modal/web_contents_modal_dialog_host.h"
20 #include "components/web_modal/web_contents_modal_dialog_manager.h" 20 #include "components/web_modal/web_contents_modal_dialog_manager.h"
(...skipping 672 matching lines...) Expand 10 before | Expand all | Expand 10 after
693 force_opaque_border); 693 force_opaque_border);
694 } 694 }
695 #if defined(USE_ASH) 695 #if defined(USE_ASH)
696 ConstrainedWindowFrameViewAsh* frame = new ConstrainedWindowFrameViewAsh; 696 ConstrainedWindowFrameViewAsh* frame = new ConstrainedWindowFrameViewAsh;
697 frame->Init(widget); 697 frame->Init(widget);
698 return frame; 698 return frame;
699 #endif 699 #endif
700 return new ConstrainedWindowFrameView(widget, 700 return new ConstrainedWindowFrameView(widget,
701 browser_context->IsOffTheRecord()); 701 browser_context->IsOffTheRecord());
702 } 702 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698