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

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

Issue 8771006: views: Move the remaining file from views/ to ui/views/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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
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/about_chrome_view.h" 5 #include "chrome/browser/ui/views/about_chrome_view.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <commdlg.h> 8 #include <commdlg.h>
9 #endif // defined(OS_WIN) 9 #endif // defined(OS_WIN)
10 10
(...skipping 22 matching lines...) Expand all
33 #include "grit/theme_resources.h" 33 #include "grit/theme_resources.h"
34 #include "ui/base/l10n/l10n_util.h" 34 #include "ui/base/l10n/l10n_util.h"
35 #include "ui/base/resource/resource_bundle.h" 35 #include "ui/base/resource/resource_bundle.h"
36 #include "ui/gfx/canvas.h" 36 #include "ui/gfx/canvas.h"
37 #include "ui/gfx/color_utils.h" 37 #include "ui/gfx/color_utils.h"
38 #include "ui/views/controls/button/text_button.h" 38 #include "ui/views/controls/button/text_button.h"
39 #include "ui/views/controls/link.h" 39 #include "ui/views/controls/link.h"
40 #include "ui/views/controls/textfield/textfield.h" 40 #include "ui/views/controls/textfield/textfield.h"
41 #include "ui/views/controls/throbber.h" 41 #include "ui/views/controls/throbber.h"
42 #include "ui/views/layout/layout_constants.h" 42 #include "ui/views/layout/layout_constants.h"
43 #include "ui/views/view_text_utils.h"
43 #include "ui/views/widget/widget.h" 44 #include "ui/views/widget/widget.h"
44 #include "views/view_text_utils.h"
45 #include "webkit/glue/webkit_glue.h" 45 #include "webkit/glue/webkit_glue.h"
46 46
47 #if defined(OS_WIN) 47 #if defined(OS_WIN)
48 #include "base/win/win_util.h" 48 #include "base/win/win_util.h"
49 #include "chrome/browser/browser_process.h" 49 #include "chrome/browser/browser_process.h"
50 #include "chrome/browser/ui/views/restart_message_box.h" 50 #include "chrome/browser/ui/views/restart_message_box.h"
51 #include "chrome/installer/util/install_util.h" 51 #include "chrome/installer/util/install_util.h"
52 #endif // defined(OS_WIN) 52 #endif // defined(OS_WIN)
53 53
54 // The amount of vertical space separating the error label at the bottom from 54 // The amount of vertical space separating the error label at the bottom from
(...skipping 738 matching lines...) Expand 10 before | Expand all | Expand 10 after
793 int height = error_label_->GetHeightForWidth( 793 int height = error_label_->GetHeightForWidth(
794 dialog_dimensions_.width() - (2 * views::kPanelHorizMargin)) + 794 dialog_dimensions_.width() - (2 * views::kPanelHorizMargin)) +
795 views::kRelatedControlVerticalSpacing; 795 views::kRelatedControlVerticalSpacing;
796 window_rect.set_height(window_rect.height() + height); 796 window_rect.set_height(window_rect.height() + height);
797 GetWidget()->SetBounds(window_rect); 797 GetWidget()->SetBounds(window_rect);
798 798
799 return height; 799 return height;
800 } 800 }
801 801
802 #endif 802 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698