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

Side by Side Diff: chrome/browser/chromeos/login/ui/simple_web_view_dialog.cc

Issue 319553008: Updated Plugin bubble model to add "learn more" link and to appear with a sliding yellow thing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated so that the yellow thing occurs only when the content setting is set to allow Created 6 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 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 "chrome/browser/chromeos/login/ui/simple_web_view_dialog.h" 5 #include "chrome/browser/chromeos/login/ui/simple_web_view_dialog.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_window_ids.h" 8 #include "ash/shell_window_ids.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 virtual ~StubBubbleModelDelegate() {} 107 virtual ~StubBubbleModelDelegate() {}
108 108
109 // ContentSettingBubbleModelDelegate implementation: 109 // ContentSettingBubbleModelDelegate implementation:
110 virtual void ShowCollectedCookiesDialog( 110 virtual void ShowCollectedCookiesDialog(
111 content::WebContents* web_contents) OVERRIDE { 111 content::WebContents* web_contents) OVERRIDE {
112 } 112 }
113 113
114 virtual void ShowContentSettingsPage(ContentSettingsType type) OVERRIDE { 114 virtual void ShowContentSettingsPage(ContentSettingsType type) OVERRIDE {
115 } 115 }
116 116
117 virtual void ShowLearnMorePage(ContentSettingsType type) OVERRIDE {
118 }
119
117 private: 120 private:
118 DISALLOW_COPY_AND_ASSIGN(StubBubbleModelDelegate); 121 DISALLOW_COPY_AND_ASSIGN(StubBubbleModelDelegate);
119 }; 122 };
120 123
121 // SimpleWebViewDialog class --------------------------------------------------- 124 // SimpleWebViewDialog class ---------------------------------------------------
122 125
123 SimpleWebViewDialog::SimpleWebViewDialog(Profile* profile) 126 SimpleWebViewDialog::SimpleWebViewDialog(Profile* profile)
124 : profile_(profile), 127 : profile_(profile),
125 back_(NULL), 128 back_(NULL),
126 forward_(NULL), 129 forward_(NULL),
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 394
392 void SimpleWebViewDialog::UpdateReload(bool is_loading, bool force) { 395 void SimpleWebViewDialog::UpdateReload(bool is_loading, bool force) {
393 if (reload_) { 396 if (reload_) {
394 reload_->ChangeMode( 397 reload_->ChangeMode(
395 is_loading ? ReloadButton::MODE_STOP : ReloadButton::MODE_RELOAD, 398 is_loading ? ReloadButton::MODE_STOP : ReloadButton::MODE_RELOAD,
396 force); 399 force);
397 } 400 }
398 } 401 }
399 402
400 } // namespace chromeos 403 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/browser_content_setting_bubble_model_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698