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

Side by Side Diff: extensions/browser/app_window/app_window.cc

Issue 744663002: Fix WeakPtrFactory member ordering in extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Incorporated changes 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 | « extensions/browser/app_window/app_window.h ('k') | no next file » | no next file with comments »
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 "extensions/browser/app_window/app_window.h" 5 #include "extensions/browser/app_window/app_window.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 227
228 // AppWindow 228 // AppWindow
229 229
230 AppWindow::AppWindow(BrowserContext* context, 230 AppWindow::AppWindow(BrowserContext* context,
231 AppDelegate* app_delegate, 231 AppDelegate* app_delegate,
232 const Extension* extension) 232 const Extension* extension)
233 : browser_context_(context), 233 : browser_context_(context),
234 extension_id_(extension->id()), 234 extension_id_(extension->id()),
235 window_type_(WINDOW_TYPE_DEFAULT), 235 window_type_(WINDOW_TYPE_DEFAULT),
236 app_delegate_(app_delegate), 236 app_delegate_(app_delegate),
237 image_loader_ptr_factory_(this),
238 fullscreen_types_(FULLSCREEN_TYPE_NONE), 237 fullscreen_types_(FULLSCREEN_TYPE_NONE),
239 show_on_first_paint_(false), 238 show_on_first_paint_(false),
240 first_paint_complete_(false), 239 first_paint_complete_(false),
241 has_been_shown_(false), 240 has_been_shown_(false),
242 can_send_events_(false), 241 can_send_events_(false),
243 is_hidden_(false), 242 is_hidden_(false),
244 cached_always_on_top_(false), 243 cached_always_on_top_(false),
245 requested_alpha_enabled_(false) { 244 requested_alpha_enabled_(false),
245 image_loader_ptr_factory_(this) {
246 ExtensionsBrowserClient* client = ExtensionsBrowserClient::Get(); 246 ExtensionsBrowserClient* client = ExtensionsBrowserClient::Get();
247 CHECK(!client->IsGuestSession(context) || context->IsOffTheRecord()) 247 CHECK(!client->IsGuestSession(context) || context->IsOffTheRecord())
248 << "Only off the record window may be opened in the guest mode."; 248 << "Only off the record window may be opened in the guest mode.";
249 } 249 }
250 250
251 void AppWindow::Init(const GURL& url, 251 void AppWindow::Init(const GURL& url,
252 AppWindowContents* app_window_contents, 252 AppWindowContents* app_window_contents,
253 const CreateParams& params) { 253 const CreateParams& params) {
254 // Initialize the render interface and web contents 254 // Initialize the render interface and web contents
255 app_window_contents_.reset(app_window_contents); 255 app_window_contents_.reset(app_window_contents);
(...skipping 835 matching lines...) Expand 10 before | Expand all | Expand 10 after
1091 region.bounds.x(), 1091 region.bounds.x(),
1092 region.bounds.y(), 1092 region.bounds.y(),
1093 region.bounds.right(), 1093 region.bounds.right(),
1094 region.bounds.bottom(), 1094 region.bounds.bottom(),
1095 region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op); 1095 region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op);
1096 } 1096 }
1097 return sk_region; 1097 return sk_region;
1098 } 1098 }
1099 1099
1100 } // namespace extensions 1100 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/browser/app_window/app_window.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698