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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
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/create_application_shortcut_view.h" 5 #include "chrome/browser/ui/views/create_application_shortcut_view.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <algorithm> 8 #include <algorithm>
9 #include <cmath> 9 #include <cmath>
10 #include <utility> 10 #include <utility>
11 11
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/bind_helpers.h" 13 #include "base/bind_helpers.h"
14 #include "base/prefs/pref_service.h"
15 #include "base/strings/utf_string_conversions.h" 14 #include "base/strings/utf_string_conversions.h"
16 #include "base/win/windows_version.h" 15 #include "base/win/windows_version.h"
17 #include "build/build_config.h" 16 #include "build/build_config.h"
18 #include "chrome/browser/extensions/tab_helper.h" 17 #include "chrome/browser/extensions/tab_helper.h"
19 #include "chrome/browser/profiles/profile.h" 18 #include "chrome/browser/profiles/profile.h"
20 #include "chrome/browser/ui/browser.h" 19 #include "chrome/browser/ui/browser.h"
21 #include "chrome/browser/ui/browser_commands.h" 20 #include "chrome/browser/ui/browser_commands.h"
22 #include "chrome/browser/ui/browser_finder.h" 21 #include "chrome/browser/ui/browser_finder.h"
23 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" 22 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
24 #include "chrome/browser/web_applications/web_app.h" 23 #include "chrome/browser/web_applications/web_app.h"
25 #include "chrome/common/chrome_constants.h" 24 #include "chrome/common/chrome_constants.h"
26 #include "chrome/common/pref_names.h" 25 #include "chrome/common/pref_names.h"
27 #include "chrome/grit/generated_resources.h" 26 #include "chrome/grit/generated_resources.h"
28 #include "chrome/grit/locale_settings.h" 27 #include "chrome/grit/locale_settings.h"
29 #include "components/constrained_window/constrained_window_views.h" 28 #include "components/constrained_window/constrained_window_views.h"
30 #include "components/favicon_base/select_favicon_frames.h" 29 #include "components/favicon_base/select_favicon_frames.h"
30 #include "components/prefs/pref_service.h"
31 #include "content/public/browser/render_view_host.h" 31 #include "content/public/browser/render_view_host.h"
32 #include "content/public/browser/render_widget_host_view.h" 32 #include "content/public/browser/render_widget_host_view.h"
33 #include "content/public/browser/web_contents.h" 33 #include "content/public/browser/web_contents.h"
34 #include "extensions/common/extension.h" 34 #include "extensions/common/extension.h"
35 #include "net/base/load_flags.h" 35 #include "net/base/load_flags.h"
36 #include "net/url_request/url_request.h" 36 #include "net/url_request/url_request.h"
37 #include "skia/ext/image_operations.h" 37 #include "skia/ext/image_operations.h"
38 #include "third_party/skia/include/core/SkBitmap.h" 38 #include "third_party/skia/include/core/SkBitmap.h"
39 #include "third_party/skia/include/core/SkPaint.h" 39 #include "third_party/skia/include/core/SkPaint.h"
40 #include "third_party/skia/include/core/SkRect.h" 40 #include "third_party/skia/include/core/SkRect.h"
(...skipping 513 matching lines...) Expand 10 before | Expand all | Expand 10 after
554 close_callback_.Run(false); 554 close_callback_.Run(false);
555 return CreateApplicationShortcutView::Cancel(); 555 return CreateApplicationShortcutView::Cancel();
556 } 556 }
557 557
558 void CreateChromeApplicationShortcutView::OnAppInfoLoaded( 558 void CreateChromeApplicationShortcutView::OnAppInfoLoaded(
559 scoped_ptr<web_app::ShortcutInfo> shortcut_info, 559 scoped_ptr<web_app::ShortcutInfo> shortcut_info,
560 const extensions::FileHandlersInfo& file_handlers_info) { 560 const extensions::FileHandlersInfo& file_handlers_info) {
561 shortcut_info_ = std::move(shortcut_info); 561 shortcut_info_ = std::move(shortcut_info);
562 file_handlers_info_ = file_handlers_info; 562 file_handlers_info_ = file_handlers_info;
563 } 563 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/collected_cookies_views.cc ('k') | chrome/browser/ui/views/critical_notification_bubble_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698