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

Side by Side Diff: chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc

Issue 7619006: base: Remove using declaration of FundamentalValue as it's no longer necessary. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 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 | « chrome/browser/prefs/pref_value_store_unittest.cc ('k') | chrome/browser/sync/sync_ui_util.cc » ('j') | 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 "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h" 5 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h"
6 6
7 #include "base/json/json_writer.h" 7 #include "base/json/json_writer.h"
8 #include "base/memory/singleton.h" 8 #include "base/memory/singleton.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 if (web_ui_) { 312 if (web_ui_) {
313 PrefService* prefs = profile_->GetPrefs(); 313 PrefService* prefs = profile_->GetPrefs();
314 gfx::Font approximate_web_font( 314 gfx::Font approximate_web_font(
315 UTF8ToUTF16(prefs->GetString(prefs::kWebKitSansSerifFontFamily)), 315 UTF8ToUTF16(prefs->GetString(prefs::kWebKitSansSerifFontFamily)),
316 prefs->GetInteger(prefs::kWebKitDefaultFontSize)); 316 prefs->GetInteger(prefs::kWebKitDefaultFontSize));
317 gfx::Size done_size = ui::GetLocalizedContentsSizeForFont( 317 gfx::Size done_size = ui::GetLocalizedContentsSizeForFont(
318 IDS_CLOUD_PRINT_SETUP_WIZARD_DONE_WIDTH_CHARS, 318 IDS_CLOUD_PRINT_SETUP_WIZARD_DONE_WIDTH_CHARS,
319 IDS_CLOUD_PRINT_SETUP_WIZARD_DONE_HEIGHT_LINES, 319 IDS_CLOUD_PRINT_SETUP_WIZARD_DONE_HEIGHT_LINES,
320 approximate_web_font); 320 approximate_web_font);
321 321
322 FundamentalValue new_width(done_size.width()); 322 base::FundamentalValue new_width(done_size.width());
323 FundamentalValue new_height(done_size.height()); 323 base::FundamentalValue new_height(done_size.height());
324 web_ui_->CallJavascriptFunction("cloudprint.showSetupDone", 324 web_ui_->CallJavascriptFunction("cloudprint.showSetupDone",
325 new_width, new_height); 325 new_width, new_height);
326 } 326 }
327 327
328 ExecuteJavascriptInIFrame(DoneIframeXPath(), 328 ExecuteJavascriptInIFrame(DoneIframeXPath(),
329 ASCIIToUTF16("cloudprint.onPageShown();")); 329 ASCIIToUTF16("cloudprint.onPageShown();"));
330 } 330 }
331 331
332 void CloudPrintSetupFlow::ExecuteJavascriptInIFrame( 332 void CloudPrintSetupFlow::ExecuteJavascriptInIFrame(
333 const string16& iframe_xpath, 333 const string16& iframe_xpath,
334 const string16& js) { 334 const string16& js) {
335 if (web_ui_) { 335 if (web_ui_) {
336 RenderViewHost* rvh = web_ui_->tab_contents()->render_view_host(); 336 RenderViewHost* rvh = web_ui_->tab_contents()->render_view_host();
337 rvh->ExecuteJavascriptInWebFrame(iframe_xpath, js); 337 rvh->ExecuteJavascriptInWebFrame(iframe_xpath, js);
338 } 338 }
339 } 339 }
OLDNEW
« no previous file with comments | « chrome/browser/prefs/pref_value_store_unittest.cc ('k') | chrome/browser/sync/sync_ui_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698