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

Side by Side Diff: chrome/browser/views/options/content_page_view.cc

Issue 65012: Move skia to DEPS, and put it in third_party. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 7 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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 <windows.h> 5 #include <windows.h>
6 #include <shlobj.h> 6 #include <shlobj.h>
7 #include <vsstyle.h> 7 #include <vsstyle.h>
8 #include <vssym32.h> 8 #include <vssym32.h>
9 9
10 #include "chrome/browser/views/options/content_page_view.h" 10 #include "chrome/browser/views/options/content_page_view.h"
11 11
12 #include "app/gfx/chrome_canvas.h" 12 #include "app/gfx/chrome_canvas.h"
13 #include "app/l10n_util.h" 13 #include "app/l10n_util.h"
14 #include "app/resource_bundle.h" 14 #include "app/resource_bundle.h"
15 #include "base/command_line.h" 15 #include "base/command_line.h"
16 #include "base/file_util.h" 16 #include "base/file_util.h"
17 #include "base/gfx/native_theme.h" 17 #include "base/gfx/native_theme.h"
18 #include "chrome/browser/browser_process.h" 18 #include "chrome/browser/browser_process.h"
19 #include "chrome/browser/shell_dialogs.h" 19 #include "chrome/browser/shell_dialogs.h"
20 #include "chrome/browser/views/options/fonts_languages_window_view.h" 20 #include "chrome/browser/views/options/fonts_languages_window_view.h"
21 #include "chrome/browser/views/options/options_group_view.h" 21 #include "chrome/browser/views/options/options_group_view.h"
22 #include "chrome/browser/views/options/passwords_exceptions_window_view.h" 22 #include "chrome/browser/views/options/passwords_exceptions_window_view.h"
23 #include "chrome/common/chrome_switches.h" 23 #include "chrome/common/chrome_switches.h"
24 #include "chrome/common/pref_names.h" 24 #include "chrome/common/pref_names.h"
25 #include "chrome/common/pref_service.h" 25 #include "chrome/common/pref_service.h"
26 #include "grit/generated_resources.h" 26 #include "grit/generated_resources.h"
27 #include "grit/theme_resources.h" 27 #include "grit/theme_resources.h"
28 #include "skia/ext/skia_utils_win.h" 28 #include "skia/ext/skia_utils_win.h"
29 #include "skia/include/SkBitmap.h" 29 #include "third_party/skia/include/core/SkBitmap.h"
30 #include "views/controls/button/radio_button.h" 30 #include "views/controls/button/radio_button.h"
31 #include "views/controls/text_field.h" 31 #include "views/controls/text_field.h"
32 #include "views/grid_layout.h" 32 #include "views/grid_layout.h"
33 #include "views/standard_layout.h" 33 #include "views/standard_layout.h"
34 #include "views/widget/widget.h" 34 #include "views/widget/widget.h"
35 35
36 namespace { 36 namespace {
37 37
38 static const int kPopupBlockingRadioGroup = 1; 38 static const int kPopupBlockingRadioGroup = 1;
39 static const int kPasswordSavingRadioGroup = 2; 39 static const int kPasswordSavingRadioGroup = 2;
(...skipping 500 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 540
541 themes_group_ = new OptionsGroupView( 541 themes_group_ = new OptionsGroupView(
542 contents, l10n_util::GetString(IDS_THEMES_GROUP_NAME), 542 contents, l10n_util::GetString(IDS_THEMES_GROUP_NAME),
543 L"", false); 543 L"", false);
544 } 544 }
545 545
546 void ContentPageView::UpdateDownloadDirectoryDisplay() { 546 void ContentPageView::UpdateDownloadDirectoryDisplay() {
547 download_default_download_location_display_->SetFile( 547 download_default_download_location_display_->SetFile(
548 FilePath::FromWStringHack(default_download_location_.GetValue())); 548 FilePath::FromWStringHack(default_download_location_.GetValue()));
549 } 549 }
OLDNEW
« no previous file with comments | « chrome/browser/views/keyword_editor_view.cc ('k') | chrome/browser/views/options/fonts_page_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698