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

Side by Side Diff: chrome/browser/ui/views/location_bar/location_bar_container_win.cc

Issue 10831345: views: Pass sort-headers.py in all files under this directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 3 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/location_bar/location_bar_container.h" 5 #include "chrome/browser/ui/views/location_bar/location_bar_container.h"
6 6
7 #include "chrome/browser/ui/omnibox/omnibox_view.h"
7 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 8 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
8 #include "chrome/browser/ui/omnibox/omnibox_view.h"
9 #include "ui/gfx/color_utils.h" 9 #include "ui/gfx/color_utils.h"
10 #include "ui/views/controls/native/native_view_host.h" 10 #include "ui/views/controls/native/native_view_host.h"
11 #include "ui/views/layout/fill_layout.h" 11 #include "ui/views/layout/fill_layout.h"
12 #include "ui/views/widget/widget.h" 12 #include "ui/views/widget/widget.h"
13 13
14 void LocationBarContainer::SetInToolbar(bool in_toolbar) { 14 void LocationBarContainer::SetInToolbar(bool in_toolbar) {
15 if (animator_.IsAnimating()) 15 if (animator_.IsAnimating())
16 animator_.Cancel(); 16 animator_.Cancel();
17 } 17 }
18 18
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 SkColor LocationBarContainer::GetBackgroundColor() { 52 SkColor LocationBarContainer::GetBackgroundColor() {
53 return color_utils::GetSysSkColor(COLOR_WINDOW); 53 return color_utils::GetSysSkColor(COLOR_WINDOW);
54 } 54 }
55 55
56 void LocationBarContainer::StackAtTop() { 56 void LocationBarContainer::StackAtTop() {
57 // TODO: reenable when PlatformInit() code is reenabled. 57 // TODO: reenable when PlatformInit() code is reenabled.
58 /* 58 /*
59 view_parent_->GetWidget()->StackAtTop(); 59 view_parent_->GetWidget()->StackAtTop();
60 */ 60 */
61 } 61 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/location_bar/location_bar_container.h ('k') | chrome/browser/ui/views/location_bar/zoom_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698