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

Side by Side Diff: chrome/browser/first_run/first_run_win.cc

Issue 6257017: views: Move standard_layout.h into the layout directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win 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
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/first_run/first_run.h" 5 #include "chrome/browser/first_run/first_run.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <shellapi.h> 8 #include <shellapi.h>
9 #include <shlobj.h> 9 #include <shlobj.h>
10 10
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 #include "grit/chromium_strings.h" 44 #include "grit/chromium_strings.h"
45 #include "grit/generated_resources.h" 45 #include "grit/generated_resources.h"
46 #include "grit/locale_settings.h" 46 #include "grit/locale_settings.h"
47 #include "grit/theme_resources.h" 47 #include "grit/theme_resources.h"
48 #include "views/controls/button/image_button.h" 48 #include "views/controls/button/image_button.h"
49 #include "views/controls/button/radio_button.h" 49 #include "views/controls/button/radio_button.h"
50 #include "views/controls/image_view.h" 50 #include "views/controls/image_view.h"
51 #include "views/controls/link.h" 51 #include "views/controls/link.h"
52 #include "views/focus/accelerator_handler.h" 52 #include "views/focus/accelerator_handler.h"
53 #include "views/grid_layout.h" 53 #include "views/grid_layout.h"
54 #include "views/standard_layout.h" 54 #include "views/layout/layout_constants.h"
55 #include "views/widget/root_view.h" 55 #include "views/widget/root_view.h"
56 #include "views/widget/widget_win.h" 56 #include "views/widget/widget_win.h"
57 #include "views/window/window.h" 57 #include "views/window/window.h"
58 #include "ui/base/resource/resource_bundle.h" 58 #include "ui/base/resource/resource_bundle.h"
59 #include "ui/base/l10n/l10n_util.h" 59 #include "ui/base/l10n/l10n_util.h"
60 #include "ui/base/ui_base_switches.h" 60 #include "ui/base/ui_base_switches.h"
61 61
62 namespace { 62 namespace {
63 63
64 bool GetNewerChromeFile(FilePath* path) { 64 bool GetNewerChromeFile(FilePath* path) {
(...skipping 791 matching lines...) Expand 10 before | Expand all | Expand 10 after
856 856
857 Upgrade::TryResult Upgrade::ShowTryChromeDialog(size_t version) { 857 Upgrade::TryResult Upgrade::ShowTryChromeDialog(size_t version) {
858 if (version > 10000) { 858 if (version > 10000) {
859 // This is a test value. We want to make sure we exercise 859 // This is a test value. We want to make sure we exercise
860 // returning this early. See EarlyReturnTest test harness. 860 // returning this early. See EarlyReturnTest test harness.
861 return Upgrade::TD_NOT_NOW; 861 return Upgrade::TD_NOT_NOW;
862 } 862 }
863 TryChromeDialog td(version); 863 TryChromeDialog td(version);
864 return td.ShowModal(); 864 return td.ShowModal();
865 } 865 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/options/wifi_config_view.cc ('k') | chrome/browser/speech/speech_input_bubble_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698