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

Side by Side Diff: views/window/dialog_client_view.cc

Issue 7996008: Get views and views_unittests to build w/ use_aura=1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed review issue Created 9 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
« no previous file with comments | « views/widget/widget_unittest.cc ('k') | no next file » | 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 "views/window/dialog_client_view.h" 5 #include "views/window/dialog_client_view.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 8
9 #if defined(OS_WIN) 9 #if defined(OS_WIN)
10 #include <windows.h> 10 #include <windows.h>
11 #include <uxtheme.h> 11 #include <uxtheme.h>
12 #include <vsstyle.h> 12 #include <vsstyle.h>
13 #else 13 #elif defined(TOOLKIT_USES_GTK)
14 #include <gtk/gtk.h> 14 #include <gtk/gtk.h>
15 #endif 15 #endif
16 16
17 #include <algorithm> 17 #include <algorithm>
18 18
19 #include "base/utf_string_conversions.h" 19 #include "base/utf_string_conversions.h"
20 #include "grit/ui_strings.h" 20 #include "grit/ui_strings.h"
21 #include "ui/base/keycodes/keyboard_codes.h" 21 #include "ui/base/keycodes/keyboard_codes.h"
22 #include "ui/base/l10n/l10n_util.h" 22 #include "ui/base/l10n/l10n_util.h"
23 #include "ui/base/resource/resource_bundle.h" 23 #include "ui/base/resource/resource_bundle.h"
(...skipping 556 matching lines...) Expand 10 before | Expand all | Expand 10 after
580 void DialogClientView::InitClass() { 580 void DialogClientView::InitClass() {
581 static bool initialized = false; 581 static bool initialized = false;
582 if (!initialized) { 582 if (!initialized) {
583 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 583 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
584 dialog_button_font_ = new gfx::Font(rb.GetFont(ResourceBundle::BaseFont)); 584 dialog_button_font_ = new gfx::Font(rb.GetFont(ResourceBundle::BaseFont));
585 initialized = true; 585 initialized = true;
586 } 586 }
587 } 587 }
588 588
589 } // namespace views 589 } // namespace views
OLDNEW
« no previous file with comments | « views/widget/widget_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698