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

Side by Side Diff: athena/extensions/chrome/athena_chrome_app_delegate.cc

Issue 702603004: Renamed DISABLE_BASIC_PRINTING and ENABLE_FULL_PRINTING. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Wed Nov 5 02:31:54 PST 2014 Created 6 years, 1 month 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
« no previous file with comments | « no previous file | build/common.gypi » ('j') | build/common.gypi » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "athena/extensions/chrome/athena_chrome_app_delegate.h" 5 #include "athena/extensions/chrome/athena_chrome_app_delegate.h"
6 6
7 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" 7 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
8 #include "chrome/browser/favicon/favicon_tab_helper.h" 8 #include "chrome/browser/favicon/favicon_tab_helper.h"
9 #include "chrome/browser/file_select_helper.h" 9 #include "chrome/browser/file_select_helper.h"
10 #include "chrome/browser/media/media_capture_devices_dispatcher.h" 10 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
11 #include "chrome/browser/platform_util.h" 11 #include "chrome/browser/platform_util.h"
12 #include "chrome/browser/ui/browser_dialogs.h" 12 #include "chrome/browser/ui/browser_dialogs.h"
13 #include "chrome/common/extensions/chrome_extension_messages.h" 13 #include "chrome/common/extensions/chrome_extension_messages.h"
14 #include "content/public/browser/render_view_host.h" 14 #include "content/public/browser/render_view_host.h"
15 #include "content/public/browser/web_contents.h" 15 #include "content/public/browser/web_contents.h"
16 16
17 #if defined(ENABLE_PRINTING) 17 #if defined(ENABLE_PRINTING)
18 #if defined(ENABLE_FULL_PRINTING) 18 #if defined(ENABLE_PRINT_PREVIEW)
19 #include "chrome/browser/printing/print_preview_message_handler.h" 19 #include "chrome/browser/printing/print_preview_message_handler.h"
20 #include "chrome/browser/printing/print_view_manager.h" 20 #include "chrome/browser/printing/print_view_manager.h"
21 #else 21 #else
22 #include "chrome/browser/printing/print_view_manager_basic.h" 22 #include "chrome/browser/printing/print_view_manager_basic.h"
23 #endif // defined(ENABLE_FULL_PRINTING) 23 #endif // defined(ENABLE_PRINT_PREVIEW)
24 #endif // defined(ENABLE_PRINTING) 24 #endif // defined(ENABLE_PRINTING)
25 25
26 namespace athena { 26 namespace athena {
27 27
28 AthenaChromeAppDelegate::AthenaChromeAppDelegate() { 28 AthenaChromeAppDelegate::AthenaChromeAppDelegate() {
29 } 29 }
30 30
31 AthenaChromeAppDelegate::~AthenaChromeAppDelegate() { 31 AthenaChromeAppDelegate::~AthenaChromeAppDelegate() {
32 } 32 }
33 33
34 void AthenaChromeAppDelegate::InitWebContents( 34 void AthenaChromeAppDelegate::InitWebContents(
35 content::WebContents* web_contents) { 35 content::WebContents* web_contents) {
36 FaviconTabHelper::CreateForWebContents(web_contents); 36 FaviconTabHelper::CreateForWebContents(web_contents);
37 37
38 #if defined(ENABLE_PRINTING) 38 #if defined(ENABLE_PRINTING)
39 #if defined(ENABLE_FULL_PRINTING) 39 #if defined(ENABLE_PRINT_PREVIEW)
40 printing::PrintViewManager::CreateForWebContents(web_contents); 40 printing::PrintViewManager::CreateForWebContents(web_contents);
41 printing::PrintPreviewMessageHandler::CreateForWebContents(web_contents); 41 printing::PrintPreviewMessageHandler::CreateForWebContents(web_contents);
42 #else 42 #else
43 printing::PrintViewManagerBasic::CreateForWebContents(web_contents); 43 printing::PrintViewManagerBasic::CreateForWebContents(web_contents);
44 #endif // defined(ENABLE_FULL_PRINTING) 44 #endif // defined(ENABLE_PRINT_PREVIEW)
45 #endif // defined(ENABLE_PRINTING) 45 #endif // defined(ENABLE_PRINTING)
46 extensions::ChromeExtensionWebContentsObserver::CreateForWebContents( 46 extensions::ChromeExtensionWebContentsObserver::CreateForWebContents(
47 web_contents); 47 web_contents);
48 } 48 }
49 49
50 content::ColorChooser* AthenaChromeAppDelegate::ShowColorChooser( 50 content::ColorChooser* AthenaChromeAppDelegate::ShowColorChooser(
51 content::WebContents* web_contents, 51 content::WebContents* web_contents,
52 SkColor initial_color) { 52 SkColor initial_color) {
53 return chrome::ShowColorChooser(web_contents, initial_color); 53 return chrome::ShowColorChooser(web_contents, initial_color);
54 } 54 }
(...skipping 28 matching lines...) Expand all
83 bool blocked) { 83 bool blocked) {
84 // RenderViewHost may be nullptr during shutdown. 84 // RenderViewHost may be nullptr during shutdown.
85 content::RenderViewHost* host = web_contents->GetRenderViewHost(); 85 content::RenderViewHost* host = web_contents->GetRenderViewHost();
86 if (host) { 86 if (host) {
87 host->Send(new ChromeViewMsg_SetVisuallyDeemphasized(host->GetRoutingID(), 87 host->Send(new ChromeViewMsg_SetVisuallyDeemphasized(host->GetRoutingID(),
88 blocked)); 88 blocked));
89 } 89 }
90 } 90 }
91 91
92 } // namespace athena 92 } // namespace athena
OLDNEW
« no previous file with comments | « no previous file | build/common.gypi » ('j') | build/common.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698