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

Side by Side Diff: chrome/browser/instant/instant_loader.cc

Issue 12212048: Linux/ChromeOS Chromium style checker cleanup, chrome/browser edition. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 7 years, 10 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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/instant/instant_loader.h" 5 #include "chrome/browser/instant/instant_loader.h"
6 6
7 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 7 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
8 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h" 8 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
9 #include "chrome/browser/favicon/favicon_tab_helper.h" 9 #include "chrome/browser/favicon/favicon_tab_helper.h"
10 #include "chrome/browser/history/history_tab_helper.h" 10 #include "chrome/browser/history/history_tab_helper.h"
(...skipping 15 matching lines...) Expand all
26 26
27 int kUserDataKey; 27 int kUserDataKey;
28 28
29 class InstantLoaderUserData : public base::SupportsUserData::Data { 29 class InstantLoaderUserData : public base::SupportsUserData::Data {
30 public: 30 public:
31 explicit InstantLoaderUserData(InstantLoader* loader) : loader_(loader) {} 31 explicit InstantLoaderUserData(InstantLoader* loader) : loader_(loader) {}
32 32
33 InstantLoader* loader() const { return loader_; } 33 InstantLoader* loader() const { return loader_; }
34 34
35 private: 35 private:
36 ~InstantLoaderUserData() {} 36 virtual ~InstantLoaderUserData() {}
37 37
38 InstantLoader* const loader_; 38 InstantLoader* const loader_;
39 39
40 DISALLOW_COPY_AND_ASSIGN(InstantLoaderUserData); 40 DISALLOW_COPY_AND_ASSIGN(InstantLoaderUserData);
41 }; 41 };
42 42
43 } 43 }
44 44
45 // WebContentsDelegateImpl ----------------------------------------------------- 45 // WebContentsDelegateImpl -----------------------------------------------------
46 46
(...skipping 372 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 content::WebContents* new_contents) { 419 content::WebContents* new_contents) {
420 DCHECK_EQ(old_contents, contents()); 420 DCHECK_EQ(old_contents, contents());
421 CleanupPreviewContents(); 421 CleanupPreviewContents();
422 // We release here without deleting so that the caller still has the 422 // We release here without deleting so that the caller still has the
423 // responsibility for deleting the WebContents. 423 // responsibility for deleting the WebContents.
424 ignore_result(contents_.release()); 424 ignore_result(contents_.release());
425 contents_.reset(new_contents); 425 contents_.reset(new_contents);
426 SetupPreviewContents(); 426 SetupPreviewContents();
427 controller_->SwappedWebContents(); 427 controller_->SwappedWebContents();
428 } 428 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698