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

Side by Side Diff: chrome/browser/ui/views/sync/one_click_signin_bubble_view.cc

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 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 | Annotate | Revision Log
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/ui/views/sync/one_click_signin_bubble_view.h" 5 #include "chrome/browser/ui/views/sync/one_click_signin_bubble_view.h"
6 6
7 #include "base/callback_helpers.h" 7 #include "base/callback_helpers.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/sync/one_click_signin_helper.h" 10 #include "chrome/browser/ui/sync/one_click_signin_helper.h"
11 #include "chrome/browser/ui/sync/one_click_signin_histogram.h" 11 #include "chrome/browser/ui/sync/one_click_signin_histogram.h"
12 #include "chrome/common/url_constants.h" 12 #include "chrome/common/url_constants.h"
13 #include "chrome/grit/chromium_strings.h"
14 #include "chrome/grit/generated_resources.h"
13 #include "components/google/core/browser/google_util.h" 15 #include "components/google/core/browser/google_util.h"
14 #include "grit/chromium_strings.h"
15 #include "grit/generated_resources.h"
16 #include "grit/theme_resources.h" 16 #include "grit/theme_resources.h"
17 #include "ui/base/l10n/l10n_util.h" 17 #include "ui/base/l10n/l10n_util.h"
18 #include "ui/base/resource/resource_bundle.h" 18 #include "ui/base/resource/resource_bundle.h"
19 #include "ui/events/keycodes/keyboard_codes.h" 19 #include "ui/events/keycodes/keyboard_codes.h"
20 #include "ui/resources/grit/ui_resources.h" 20 #include "ui/resources/grit/ui_resources.h"
21 #include "ui/views/controls/button/image_button.h" 21 #include "ui/views/controls/button/image_button.h"
22 #include "ui/views/controls/button/label_button.h" 22 #include "ui/views/controls/button/label_button.h"
23 #include "ui/views/controls/image_view.h" 23 #include "ui/views/controls/image_view.h"
24 #include "ui/views/controls/label.h" 24 #include "ui/views/controls/label.h"
25 #include "ui/views/controls/link.h" 25 #include "ui/views/controls/link.h"
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 // we'll be destroyed asynchronously and the shown state will be checked 408 // we'll be destroyed asynchronously and the shown state will be checked
409 // before then. 409 // before then.
410 DCHECK_EQ(bubble_view_, this); 410 DCHECK_EQ(bubble_view_, this);
411 bubble_view_ = NULL; 411 bubble_view_ = NULL;
412 412
413 if (is_sync_dialog_ && !start_sync_callback_.is_null()) { 413 if (is_sync_dialog_ && !start_sync_callback_.is_null()) {
414 base::ResetAndReturn(&start_sync_callback_).Run( 414 base::ResetAndReturn(&start_sync_callback_).Run(
415 OneClickSigninSyncStarter::UNDO_SYNC); 415 OneClickSigninSyncStarter::UNDO_SYNC);
416 } 416 }
417 } 417 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/session_crashed_bubble_view.cc ('k') | chrome/browser/ui/views/tabs/tab.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698