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

Side by Side Diff: chrome/browser/alternate_nav_url_fetcher.cc

Issue 6263008: Move ResourceBundle, DataPack to ui/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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
« no previous file with comments | « chrome/app/chrome_main.cc ('k') | chrome/browser/autocomplete/autocomplete_edit_view_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/alternate_nav_url_fetcher.h" 5 #include "chrome/browser/alternate_nav_url_fetcher.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/resource_bundle.h"
9 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/intranet_redirect_detector.h" 9 #include "chrome/browser/intranet_redirect_detector.h"
11 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/tab_contents/navigation_controller.h" 11 #include "chrome/browser/tab_contents/navigation_controller.h"
13 #include "chrome/browser/tab_contents/navigation_entry.h" 12 #include "chrome/browser/tab_contents/navigation_entry.h"
14 #include "chrome/browser/tab_contents/tab_contents.h" 13 #include "chrome/browser/tab_contents/tab_contents.h"
15 #include "chrome/common/notification_service.h" 14 #include "chrome/common/notification_service.h"
16 #include "grit/generated_resources.h" 15 #include "grit/generated_resources.h"
17 #include "grit/theme_resources.h" 16 #include "grit/theme_resources.h"
18 #include "net/base/registry_controlled_domain.h" 17 #include "net/base/registry_controlled_domain.h"
19 #include "net/url_request/url_request.h" 18 #include "net/url_request/url_request.h"
19 #include "ui/base/resource/resource_bundle.h"
20 20
21 AlternateNavURLFetcher::AlternateNavURLFetcher( 21 AlternateNavURLFetcher::AlternateNavURLFetcher(
22 const GURL& alternate_nav_url) 22 const GURL& alternate_nav_url)
23 : LinkInfoBarDelegate(NULL), 23 : LinkInfoBarDelegate(NULL),
24 alternate_nav_url_(alternate_nav_url), 24 alternate_nav_url_(alternate_nav_url),
25 controller_(NULL), 25 controller_(NULL),
26 state_(NOT_STARTED), 26 state_(NOT_STARTED),
27 navigated_to_entry_(false), 27 navigated_to_entry_(false),
28 infobar_contents_(NULL) { 28 infobar_contents_(NULL) {
29 registrar_.Add(this, NotificationType::NAV_ENTRY_PENDING, 29 registrar_.Add(this, NotificationType::NAV_ENTRY_PENDING,
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 if (state_ == FAILED) 162 if (state_ == FAILED)
163 delete this; 163 delete this;
164 return; 164 return;
165 } 165 }
166 166
167 infobar_contents_ = controller_->tab_contents(); 167 infobar_contents_ = controller_->tab_contents();
168 StoreActiveEntryUniqueID(infobar_contents_); 168 StoreActiveEntryUniqueID(infobar_contents_);
169 // We will be deleted when the InfoBar is destroyed. (See InfoBarClosed). 169 // We will be deleted when the InfoBar is destroyed. (See InfoBarClosed).
170 infobar_contents_->AddInfoBar(this); 170 infobar_contents_->AddInfoBar(this);
171 } 171 }
OLDNEW
« no previous file with comments | « chrome/app/chrome_main.cc ('k') | chrome/browser/autocomplete/autocomplete_edit_view_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698