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

Side by Side Diff: chrome/browser/ui/webui/app_launcher_login_handler.cc

Issue 2781823002: Revert of cc/paint: Remove cc::PaintSurface. (Closed)
Patch Set: Created 3 years, 8 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/webui/app_launcher_login_handler.h" 5 #include "chrome/browser/ui/webui/app_launcher_login_handler.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 24 matching lines...) Expand all
35 #include "components/browser_sync/profile_sync_service.h" 35 #include "components/browser_sync/profile_sync_service.h"
36 #include "components/prefs/pref_service.h" 36 #include "components/prefs/pref_service.h"
37 #include "components/signin/core/browser/signin_manager.h" 37 #include "components/signin/core/browser/signin_manager.h"
38 #include "content/public/browser/host_zoom_map.h" 38 #include "content/public/browser/host_zoom_map.h"
39 #include "content/public/browser/user_metrics.h" 39 #include "content/public/browser/user_metrics.h"
40 #include "content/public/browser/web_contents.h" 40 #include "content/public/browser/web_contents.h"
41 #include "content/public/browser/web_ui.h" 41 #include "content/public/browser/web_ui.h"
42 #include "content/public/common/page_zoom.h" 42 #include "content/public/common/page_zoom.h"
43 #include "net/base/escape.h" 43 #include "net/base/escape.h"
44 #include "skia/ext/image_operations.h" 44 #include "skia/ext/image_operations.h"
45 #include "third_party/skia/include/core/SkSurface.h"
46 #include "ui/base/l10n/l10n_util.h" 45 #include "ui/base/l10n/l10n_util.h"
47 #include "ui/base/webui/web_ui_util.h" 46 #include "ui/base/webui/web_ui_util.h"
48 #include "ui/gfx/canvas.h" 47 #include "ui/gfx/canvas.h"
49 #include "ui/gfx/image/image.h" 48 #include "ui/gfx/image/image.h"
50 #include "ui/gfx/skia_util.h" 49 #include "ui/gfx/skia_util.h"
51 50
52 using content::OpenURLParams; 51 using content::OpenURLParams;
53 using content::Referrer; 52 using content::Referrer;
54 53
55 namespace { 54 namespace {
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 values->SetString("login_status_message", message); 255 values->SetString("login_status_message", message);
257 values->SetString("login_status_url", 256 values->SetString("login_status_url",
258 hide_sync ? std::string() : chrome::kSyncLearnMoreURL); 257 hide_sync ? std::string() : chrome::kSyncLearnMoreURL);
259 values->SetString("login_status_advanced", 258 values->SetString("login_status_advanced",
260 hide_sync ? base::string16() : 259 hide_sync ? base::string16() :
261 l10n_util::GetStringUTF16(IDS_SYNC_PROMO_NTP_BUBBLE_ADVANCED)); 260 l10n_util::GetStringUTF16(IDS_SYNC_PROMO_NTP_BUBBLE_ADVANCED));
262 values->SetString("login_status_dismiss", 261 values->SetString("login_status_dismiss",
263 hide_sync ? base::string16() : 262 hide_sync ? base::string16() :
264 l10n_util::GetStringUTF16(IDS_SYNC_PROMO_NTP_BUBBLE_OK)); 263 l10n_util::GetStringUTF16(IDS_SYNC_PROMO_NTP_BUBBLE_OK));
265 } 264 }
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_pixeltest_masks.cc ('k') | content/renderer/image_capture/image_capture_frame_grabber.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698