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

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

Issue 2074213002: mash: Move ash_switches.* to ash/common; cleanup DEPS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix broken relative include. Created 4 years, 6 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 <stddef.h> 7 #include <stddef.h>
8 #include <algorithm> 8 #include <algorithm>
9 #include <limits> 9 #include <limits>
10 #include <memory> 10 #include <memory>
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 #include "extensions/common/permissions/permissions_data.h" 88 #include "extensions/common/permissions/permissions_data.h"
89 #include "extensions/common/user_script.h" 89 #include "extensions/common/user_script.h"
90 #include "net/base/escape.h" 90 #include "net/base/escape.h"
91 #include "skia/ext/image_operations.h" 91 #include "skia/ext/image_operations.h"
92 #include "skia/ext/platform_canvas.h" 92 #include "skia/ext/platform_canvas.h"
93 #include "third_party/skia/include/core/SkBitmap.h" 93 #include "third_party/skia/include/core/SkBitmap.h"
94 #include "ui/base/models/list_selection_model.h" 94 #include "ui/base/models/list_selection_model.h"
95 #include "ui/base/ui_base_types.h" 95 #include "ui/base/ui_base_types.h"
96 96
97 #if defined(USE_ASH) 97 #if defined(USE_ASH)
98 #include "ash/ash_switches.h" 98 #include "ash/common/ash_switches.h"
99 #include "chrome/browser/extensions/api/tabs/ash_panel_contents.h" 99 #include "chrome/browser/extensions/api/tabs/ash_panel_contents.h"
100 #include "extensions/browser/app_window/app_window_registry.h" 100 #include "extensions/browser/app_window/app_window_registry.h"
101 #endif 101 #endif
102 102
103 using content::BrowserThread; 103 using content::BrowserThread;
104 using content::NavigationController; 104 using content::NavigationController;
105 using content::NavigationEntry; 105 using content::NavigationEntry;
106 using content::OpenURLParams; 106 using content::OpenURLParams;
107 using content::Referrer; 107 using content::Referrer;
108 using content::WebContents; 108 using content::WebContents;
(...skipping 2045 matching lines...) Expand 10 before | Expand all | Expand 10 after
2154 ZoomModeToZoomSettings(zoom_mode, &zoom_settings); 2154 ZoomModeToZoomSettings(zoom_mode, &zoom_settings);
2155 zoom_settings.default_zoom_factor.reset(new double( 2155 zoom_settings.default_zoom_factor.reset(new double(
2156 content::ZoomLevelToZoomFactor(zoom_controller->GetDefaultZoomLevel()))); 2156 content::ZoomLevelToZoomFactor(zoom_controller->GetDefaultZoomLevel())));
2157 2157
2158 results_ = api::tabs::GetZoomSettings::Results::Create(zoom_settings); 2158 results_ = api::tabs::GetZoomSettings::Results::Create(zoom_settings);
2159 SendResponse(true); 2159 SendResponse(true);
2160 return true; 2160 return true;
2161 } 2161 }
2162 2162
2163 } // namespace extensions 2163 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698