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

Side by Side Diff: chrome/browser/extensions/api/tabs/tabs_api.cc

Issue 1336993002: Straighten up includes of host_desktop.h/host_desktop_type.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@host_desktop_type
Patch Set: Build fixes for Windows and Mac Created 5 years, 3 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/extensions/api/tabs/tabs_api.h" 5 #include "chrome/browser/extensions/api/tabs/tabs_api.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 #include "extensions/common/manifest_handlers/default_locale_handler.h" 84 #include "extensions/common/manifest_handlers/default_locale_handler.h"
85 #include "extensions/common/message_bundle.h" 85 #include "extensions/common/message_bundle.h"
86 #include "extensions/common/permissions/permissions_data.h" 86 #include "extensions/common/permissions/permissions_data.h"
87 #include "extensions/common/user_script.h" 87 #include "extensions/common/user_script.h"
88 #include "net/base/escape.h" 88 #include "net/base/escape.h"
89 #include "skia/ext/image_operations.h" 89 #include "skia/ext/image_operations.h"
90 #include "skia/ext/platform_canvas.h" 90 #include "skia/ext/platform_canvas.h"
91 #include "third_party/skia/include/core/SkBitmap.h" 91 #include "third_party/skia/include/core/SkBitmap.h"
92 #include "ui/base/models/list_selection_model.h" 92 #include "ui/base/models/list_selection_model.h"
93 #include "ui/base/ui_base_types.h" 93 #include "ui/base/ui_base_types.h"
94 #include "ui/gfx/host_desktop_type.h"
94 95
95 #if defined(USE_ASH) 96 #if defined(USE_ASH)
96 #include "ash/ash_switches.h" 97 #include "ash/ash_switches.h"
97 #include "chrome/browser/extensions/api/tabs/ash_panel_contents.h" 98 #include "chrome/browser/extensions/api/tabs/ash_panel_contents.h"
98 #include "extensions/browser/app_window/app_window_registry.h" 99 #include "extensions/browser/app_window/app_window_registry.h"
99 #endif 100 #endif
100 101
101 using content::BrowserThread; 102 using content::BrowserThread;
102 using content::NavigationController; 103 using content::NavigationController;
103 using content::NavigationEntry; 104 using content::NavigationEntry;
(...skipping 1945 matching lines...) Expand 10 before | Expand all | Expand 10 after
2049 ZoomModeToZoomSettings(zoom_mode, &zoom_settings); 2050 ZoomModeToZoomSettings(zoom_mode, &zoom_settings);
2050 zoom_settings.default_zoom_factor.reset(new double( 2051 zoom_settings.default_zoom_factor.reset(new double(
2051 content::ZoomLevelToZoomFactor(zoom_controller->GetDefaultZoomLevel()))); 2052 content::ZoomLevelToZoomFactor(zoom_controller->GetDefaultZoomLevel())));
2052 2053
2053 results_ = api::tabs::GetZoomSettings::Results::Create(zoom_settings); 2054 results_ = api::tabs::GetZoomSettings::Results::Create(zoom_settings);
2054 SendResponse(true); 2055 SendResponse(true);
2055 return true; 2056 return true;
2056 } 2057 }
2057 2058
2058 } // namespace extensions 2059 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698